klas/t6_mem0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Refactor] Improve logging package wide (#1315)

Browse Source
This commit is contained in:
Deshraj Yadav
2024-03-13 17:13:30 -07:00
committed by GitHub
parent ef69c91b60
commit 3616eaadb4
54 changed files with 263 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/api_server/api_server.py
View File

@@ -7,6 +7,9 @@ from embedchain import App
app = Flask(__name__)
logger = logging.getLogger(__name__)
@app.route("/add", methods=["POST"])
def add():
data = request.get_json()
@@ -17,7 +20,7 @@ def add():
App().add(url_or_text, data_type=data_type)
return jsonify({"data": f"Added {data_type}: {url_or_text}"}), 200
except Exception:
logging.exception(f"Failed to add {data_type=}: {url_or_text=}")
logger.exception(f"Failed to add {data_type=}: {url_or_text=}")
return jsonify({"error": f"Failed to add {data_type}: {url_or_text}"}), 500
return jsonify({"error": "Invalid request. Please provide 'data_type' and 'url_or_text' in JSON format."}), 400
@@ -31,7 +34,7 @@ def query():
response = App().query(question)
return jsonify({"data": response}), 200
except Exception:
logging.exception(f"Failed to query {question=}")
logger.exception(f"Failed to query {question=}")
return jsonify({"error": "An error occurred. Please try again!"}), 500
return jsonify({"error": "Invalid request. Please provide 'question' in JSON format."}), 400
@@ -45,7 +48,7 @@ def chat():
response = App().chat(question)
return jsonify({"data": response}), 200
except Exception:
logging.exception(f"Failed to chat {question=}")
logger.exception(f"Failed to chat {question=}")
return jsonify({"error": "An error occurred. Please try again!"}), 500
return jsonify({"error": "Invalid request. Please provide 'question' in JSON format."}), 400

10
examples/nextjs/nextjs_discord/app.py
View File

@@ -12,10 +12,12 @@ intents.message_content = True
client = discord.Client(intents=intents)
discord_bot_name = os.environ["DISCORD_BOT_NAME"]
logger = logging.getLogger(__name__)
class NextJSBot:
def __init__(self) -> None:
logging.info("NextJS Bot powered with embedchain.")
logger.info("NextJS Bot powered with embedchain.")
def add(self, _):
raise ValueError("Add is not implemented yet")
@@ -31,11 +33,11 @@ class NextJSBot:
try:
response = response.json()
except Exception:
logging.error(f"Failed to parse response: {response}")
logger.error(f"Failed to parse response: {response}")
response = {}
return response
except Exception:
logging.exception(f"Failed to query {message}.")
logger.exception(f"Failed to query {message}.")
response = "An error occurred. Please try again!"
return response
@@ -49,7 +51,7 @@ NEXTJS_BOT = NextJSBot()
@client.event
async def on_ready():
logging.info(f"User {client.user.name} logged in with id: {client.user.id}!")
logger.info(f"User {client.user.name} logged in with id: {client.user.id}!")
def _get_question(message):

8
examples/nextjs/nextjs_slack/app.py
View File

@@ -9,6 +9,8 @@ from slack_bolt.adapter.socket_mode import SocketModeHandler
load_dotenv(".env")
logger = logging.getLogger(__name__)
def remove_mentions(message):
mention_pattern = re.compile(r"<@[^>]+>")
@@ -19,7 +21,7 @@ def remove_mentions(message):
class SlackBotApp:
def __init__(self) -> None:
logging.info("Slack Bot using Embedchain!")
logger.info("Slack Bot using Embedchain!")
def add(self, _):
raise ValueError("Add is not implemented yet")
@@ -35,11 +37,11 @@ class SlackBotApp:
try:
response = response.json()
except Exception:
logging.error(f"Failed to parse response: {response}")
logger.error(f"Failed to parse response: {response}")
response = {}
return response
except Exception:
logging.exception(f"Failed to query {query}.")
logger.exception(f"Failed to query {query}.")
response = "An error occurred. Please try again!"
return response

20
examples/rest-api/main.py
View File

@@ -13,6 +13,8 @@ from utils import generate_error_message_for_api_keys
from embedchain import App
from embedchain.client import Client
logger = logging.getLogger(__name__)
Base.metadata.create_all(bind=engine)
@@ -84,7 +86,7 @@ async def create_app_using_default_config(app_id: str, config: UploadFile = None
return DefaultResponse(response=f"App created successfully. App ID: {app_id}")
except Exception as e:
logging.warning(str(e))
logger.warning(str(e))
raise HTTPException(detail=f"Error creating app: {str(e)}", status_code=400)
@@ -114,13 +116,13 @@ async def get_datasources_associated_with_app_id(app_id: str, db: Session = Depe
response = app.get_data_sources()
return {"results": response}
except ValueError as ve:
logging.warning(str(ve))
logger.warning(str(ve))
raise HTTPException(
detail=generate_error_message_for_api_keys(ve),
status_code=400,
)
except Exception as e:
logging.warning(str(e))
logger.warning(str(e))
raise HTTPException(detail=f"Error occurred: {str(e)}", status_code=400)
@@ -153,13 +155,13 @@ async def add_datasource_to_an_app(body: SourceApp, app_id: str, db: Session = D
response = app.add(source=body.source, data_type=body.data_type)
return DefaultResponse(response=response)
except ValueError as ve:
logging.warning(str(ve))
logger.warning(str(ve))
raise HTTPException(
detail=generate_error_message_for_api_keys(ve),
status_code=400,
)
except Exception as e:
logging.warning(str(e))
logger.warning(str(e))
raise HTTPException(detail=f"Error occurred: {str(e)}", status_code=400)
@@ -191,13 +193,13 @@ async def query_an_app(body: QueryApp, app_id: str, db: Session = Depends(get_db
response = app.query(body.query)
return DefaultResponse(response=response)
except ValueError as ve:
logging.warning(str(ve))
logger.warning(str(ve))
raise HTTPException(
detail=generate_error_message_for_api_keys(ve),
status_code=400,
)
except Exception as e:
logging.warning(str(e))
logger.warning(str(e))
raise HTTPException(detail=f"Error occurred: {str(e)}", status_code=400)
@@ -274,13 +276,13 @@ async def deploy_app(body: DeployAppRequest, app_id: str, db: Session = Depends(
app.deploy()
return DefaultResponse(response="App deployed successfully.")
except ValueError as ve:
logging.warning(str(ve))
logger.warning(str(ve))
raise HTTPException(
detail=generate_error_message_for_api_keys(ve),
status_code=400,
)
except Exception as e:
logging.warning(str(e))
logger.warning(str(e))
raise HTTPException(detail=f"Error occurred: {str(e)}", status_code=400)