backend: Remove metrics (#784)

* wip * Remove metrics code * add workflow * test * test * test * test * test * fix
cohere-ai · Sep 26, 2024 · b851a07 · b851a07
1 parent f83b64b
commit b851a07
Show file tree

Hide file tree

Showing 23 changed files with 18 additions and 1,151 deletions.
diff --git a/.github/workflows/python-lint.yml b/.github/workflows/python-lint.yml
@@ -9,7 +9,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          clean: true
       - name: Run lint checks
         uses: chartboost/ruff-action@v1
         with:

diff --git a/.github/workflows/python-typecheck.yml b/.github/workflows/python-typecheck.yml
@@ -1,4 +1,4 @@
-name: Typecheck
+name: Typecheck newly added Python files
 
 on:
   push:
@@ -13,10 +13,19 @@ jobs:
       - run: pipx install poetry
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11' 
+          python-version: '3.11'
           cache: 'poetry'
       - run: poetry install
       - run: echo "$(poetry env info --path)/bin" >> $GITHUB_PATH
-      - uses: jakebailey/pyright-action@v2
+      - name: Get new files added in the PR
+        id: get_new_files
+        run: |
+          git fetch origin main
+          NEW_PY_FILES=$(git diff --name-only --diff-filter=A origin/main HEAD | grep '\.py$' | tr '\n' ' ')
+          echo "New files: $NEW_PY_FILES"
+          echo "new_py_files=$NEW_PY_FILES" >> $GITHUB_OUTPUT
+      - name: Typecheck new files
+        uses: jakebailey/pyright-action@v2
         with:
           version: 1.1.311
+          extra-args: ${{ steps.get_new_files.outputs.new_py_files }}
diff --git a/helper_scripts/metrics_helper.py b/helper_scripts/metrics_helper.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -109,7 +109,7 @@ build-backend = "poetry.core.masonry.api"
 include = [
   "src/backend/services/metrics.py", 
   "src/backend/tools/google_drive/sync/actions/",
-  ]
+]
 defineConstant = { DEBUG = true }
 reportMissingImports = true
 reportMissingTypeStubs = false

diff --git a/src/backend/config/tools.py b/src/backend/config/tools.py
@@ -31,7 +31,6 @@
 Don't forget to add the implementation to this AVAILABLE_TOOLS dictionary!
 """
 
-
 class ToolName(StrEnum):
     Wiki_Retriever_LangChain = LangChainWikiRetriever.NAME
     Search_File = SearchFileTool.NAME

diff --git a/src/backend/main.py b/src/backend/main.py
@@ -29,7 +29,6 @@
 from backend.routers.user import router as user_router
 from backend.services.context import ContextMiddleware, get_context
 from backend.services.logger.middleware import LoggingMiddleware
-from backend.services.metrics import MetricsMiddleware
 
 load_dotenv()
 
@@ -81,7 +80,6 @@ def create_app():
         allow_headers=["*"],
     )
     app.add_middleware(LoggingMiddleware)
-    app.add_middleware(MetricsMiddleware)
     app.add_middleware(ContextMiddleware)  # This should be the first middleware
     app.add_exception_handler(SCIMException, scim_exception_handler)
 

diff --git a/src/backend/model_deployments/azure.py b/src/backend/model_deployments/azure.py
@@ -8,7 +8,6 @@
 from backend.model_deployments.utils import get_model_config_var
 from backend.schemas.cohere_chat import CohereChatRequest
 from backend.schemas.context import Context
-from backend.services.metrics import collect_metrics_chat_stream, collect_metrics_rerank
 
 AZURE_API_KEY_ENV_VAR = "AZURE_API_KEY"
 # Example URL: "https://<endpoint>.<region>.inference.ai.azure.com/v1"
@@ -69,7 +68,6 @@ async def invoke_chat(self, chat_request: CohereChatRequest) -> Any:
         )
         yield to_dict(response)
 
-    @collect_metrics_chat_stream
     async def invoke_chat_stream(
         self, chat_request: CohereChatRequest, ctx: Context, **kwargs
     ) -> AsyncGenerator[Any, Any]:
@@ -80,7 +78,6 @@ async def invoke_chat_stream(
         for event in stream:
             yield to_dict(event)
 
-    @collect_metrics_rerank
     async def invoke_rerank(
         self, query: str, documents: List[Dict[str, Any]], ctx: Context
     ) -> Any:

diff --git a/src/backend/model_deployments/bedrock.py b/src/backend/model_deployments/bedrock.py
@@ -8,7 +8,6 @@
 from backend.model_deployments.utils import get_model_config_var
 from backend.schemas.cohere_chat import CohereChatRequest
 from backend.schemas.context import Context
-from backend.services.metrics import collect_metrics_chat_stream, collect_metrics_rerank
 
 BEDROCK_ACCESS_KEY_ENV_VAR = "BEDROCK_ACCESS_KEY"
 BEDROCK_SECRET_KEY_ENV_VAR = "BEDROCK_SECRET_KEY"
@@ -80,7 +79,6 @@ async def invoke_chat(self, chat_request: CohereChatRequest) -> Any:
         )
         yield to_dict(response)
 
-    @collect_metrics_chat_stream
     async def invoke_chat_stream(
         self, chat_request: CohereChatRequest, ctx: Context, **kwargs: Any
     ) -> AsyncGenerator[Any, Any]:
@@ -95,7 +93,6 @@ async def invoke_chat_stream(
         for event in stream:
             yield to_dict(event)
 
-    @collect_metrics_rerank
     async def invoke_rerank(
         self, query: str, documents: List[Dict[str, Any]], ctx: Context
     ) -> Any:

diff --git a/src/backend/model_deployments/cohere_platform.py b/src/backend/model_deployments/cohere_platform.py
@@ -10,7 +10,6 @@
 from backend.schemas.cohere_chat import CohereChatRequest
 from backend.schemas.context import Context
 from backend.services.logger.utils import LoggerFactory
-from backend.services.metrics import collect_metrics_chat_stream, collect_metrics_rerank
 
 COHERE_API_KEY_ENV_VAR = "COHERE_API_KEY"
 COHERE_ENV_VARS = [COHERE_API_KEY_ENV_VAR]
@@ -73,7 +72,6 @@ async def invoke_chat(
         )
         yield to_dict(response)
 
-    @collect_metrics_chat_stream
     async def invoke_chat_stream(
         self, chat_request: CohereChatRequest, ctx: Context, **kwargs: Any
     ) -> Any:
@@ -96,7 +94,6 @@ async def invoke_chat_stream(
 
             yield event_dict
 
-    @collect_metrics_rerank
     async def invoke_rerank(
         self, query: str, documents: List[Dict[str, Any]], ctx: Context, **kwargs: Any
     ) -> Any:

diff --git a/src/backend/model_deployments/sagemaker.py b/src/backend/model_deployments/sagemaker.py
@@ -9,7 +9,6 @@
 from backend.model_deployments.utils import get_model_config_var
 from backend.schemas.cohere_chat import CohereChatRequest
 from backend.schemas.context import Context
-from backend.services.metrics import collect_metrics_chat_stream, collect_metrics_rerank
 
 SAGE_MAKER_ACCESS_KEY_ENV_VAR = "SAGE_MAKER_ACCESS_KEY"
 SAGE_MAKER_SECRET_KEY_ENV_VAR = "SAGE_MAKER_SECRET_KEY"
@@ -93,7 +92,6 @@ def is_available(cls) -> bool:
             and SageMakerDeployment.aws_session_token is not None
         )
 
-    @collect_metrics_chat_stream
     async def invoke_chat_stream(
         self, chat_request: CohereChatRequest, ctx: Context, **kwargs: Any
     ) -> AsyncGenerator[Any, Any]:
@@ -115,7 +113,6 @@ async def invoke_chat_stream(
             stream_event["index"] = index
             yield stream_event
 
-    @collect_metrics_rerank
     async def invoke_rerank(
         self, query: str, documents: List[Dict[str, Any]], ctx: Context
     ) -> Any:

diff --git a/src/backend/model_deployments/single_container.py b/src/backend/model_deployments/single_container.py
@@ -8,7 +8,6 @@
 from backend.model_deployments.utils import get_model_config_var
 from backend.schemas.cohere_chat import CohereChatRequest
 from backend.schemas.context import Context
-from backend.services.metrics import collect_metrics_chat_stream, collect_metrics_rerank
 
 DEFAULT_RERANK_MODEL = "rerank-english-v2.0"
 SC_URL_ENV_VAR = "SINGLE_CONTAINER_URL"
@@ -61,7 +60,6 @@ async def invoke_chat(self, chat_request: CohereChatRequest) -> Any:
         )
         yield to_dict(response)
 
-    @collect_metrics_chat_stream
     async def invoke_chat_stream(
         self, chat_request: CohereChatRequest, ctx: Context, **kwargs: Any
     ) -> AsyncGenerator[Any, Any]:
@@ -74,7 +72,6 @@ async def invoke_chat_stream(
         for event in stream:
             yield to_dict(event)
 
-    @collect_metrics_rerank
     async def invoke_rerank(
         self, query: str, documents: List[Dict[str, Any]], ctx: Context
     ) -> Any: