Merge branch 'dev' into f/mmr-in-python

julep-ai · Oct 29, 2024 · 805992f · 805992f
2 parents 75db5a0 + 101be27
commit 805992f
Show file tree

Hide file tree

Showing 98 changed files with 10,898 additions and 2,207 deletions.
diff --git a/.github/workflows/lint-integrations-service-pr.yml b/.github/workflows/lint-integrations-service-pr.yml
@@ -0,0 +1,57 @@
+name: Lint integrations-service
+run-name: ${{ github.actor }} is linting the code
+
+on:
+  pull_request:
+    paths:
+      - 'integrations-service/**'
+  push:
+    paths:
+      - 'integrations-service/**'
+
+jobs:
+  Lint-And-Format:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+
+      - name: Configure Poetry to use .venv
+        run: |
+          cd integrations-service
+          poetry config virtualenvs.in-project true
+
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v4
+        with:
+          path: integrations-service/.venv
+          key: ${{ runner.os }}-integrations-service-poetry-${{ hashFiles('integrations-service/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-integrations-service-poetry-
+
+      - name: Install dependencies
+        run: |
+          cd integrations-service
+          poetry install
+
+      - name: Lint and format
+        run: |
+          cd integrations-service
+          poetry run poe format
+          poetry run poe lint
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "refactor: Lint integrations-service (CI)"
+          branch: ${{ github.head_ref }}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} 
diff --git a/.github/workflows/test-integrations-service-pr.yml b/.github/workflows/test-integrations-service-pr.yml
@@ -0,0 +1,50 @@
+name: Test integrations-service
+run-name: ${{ github.actor }} is testing the code
+
+on:
+  pull_request:
+    paths:
+      - 'integrations-service/**'
+  push:
+    paths:
+      - 'integrations-service/**'
+
+jobs:
+  Test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+
+      - name: Configure Poetry to use .venv
+        run: |
+          cd integrations-service
+          poetry config virtualenvs.in-project true
+
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v4
+        with:
+          path: integrations-service/.venv
+          key: ${{ runner.os }}-integrations-service-poetry-${{ hashFiles('integrations-service/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-integrations-service-poetry-
+
+      - name: Install dependencies
+        run: |
+          cd integrations-service
+          poetry install
+
+      - name: Run tests
+        run: |
+          cd integrations-service
+          poetry run poe test
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }} 
diff --git a/agents-api/agents_api/activities/execute_integration.py b/agents-api/agents_api/activities/execute_integration.py
@@ -3,7 +3,7 @@
 from beartype import beartype
 from temporalio import activity
 
-from ..autogen.openapi_model import IntegrationDef
+from ..autogen.openapi_model import BaseIntegrationDef
 from ..clients import integrations
 from ..common.protocol.tasks import StepContext
 from ..common.storage_handler import auto_blob_store
@@ -16,7 +16,7 @@
 async def execute_integration(
     context: StepContext,
     tool_name: str,
-    integration: IntegrationDef,
+    integration: BaseIntegrationDef,
     arguments: dict[str, Any],
     setup: dict[str, Any] = {},
 ) -> Any:

diff --git a/agents-api/agents_api/autogen/Agents.py b/agents-api/agents_api/autogen/Agents.py
@@ -28,11 +28,10 @@ class Agent(BaseModel):
     name: Annotated[
         str,
         Field(
-            "",
             max_length=120,
             pattern="^[\\p{L}\\p{Nl}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]+[\\p{ID_Start}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]*$",
         ),
-    ]
+    ] = ""
     """
     Name of the agent
     """
@@ -66,11 +65,10 @@ class CreateAgentRequest(BaseModel):
     name: Annotated[
         str,
         Field(
-            "",
             max_length=120,
             pattern="^[\\p{L}\\p{Nl}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]+[\\p{ID_Start}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]*$",
         ),
-    ]
+    ] = ""
     """
     Name of the agent
     """
@@ -101,11 +99,10 @@ class CreateOrUpdateAgentRequest(CreateAgentRequest):
     name: Annotated[
         str,
         Field(
-            "",
             max_length=120,
             pattern="^[\\p{L}\\p{Nl}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]+[\\p{ID_Start}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]*$",
         ),
-    ]
+    ] = ""
     """
     Name of the agent
     """
@@ -139,11 +136,10 @@ class PatchAgentRequest(BaseModel):
     name: Annotated[
         str,
         Field(
-            "",
             max_length=120,
             pattern="^[\\p{L}\\p{Nl}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]+[\\p{ID_Start}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]*$",
         ),
-    ]
+    ] = ""
     """
     Name of the agent
     """
@@ -177,11 +173,10 @@ class UpdateAgentRequest(BaseModel):
     name: Annotated[
         str,
         Field(
-            "",
             max_length=120,
             pattern="^[\\p{L}\\p{Nl}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]+[\\p{ID_Start}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\p{Pattern_Syntax}\\p{Pattern_White_Space}]*$",
         ),
-    ]
+    ] = ""
     """
     Name of the agent
     """