Merge to prod

.github/workflows/main.yaml

@@ -1,18 +1,37 @@
-name: Run Tests on Production Environment
+name: Run Tests
 
 on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
+      # any branch other than main, will use the test key
+      - test
   workflow_dispatch:  
 
 jobs:
-  test:
+  setup-and-test:
     runs-on: ubuntu-latest
-    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        test-suite: [
+          'tests/unit',
+          'tests/functional/file_asset',
+          'tests/functional/data_asset',
+          'tests/functional/benchmark',
+          'tests/functional/model',
+          'tests/functional/pipelines/run_test.py --pipeline_version 2.0 --sdk_version v1 --sdk_version_param PipelineFactory',
+          'tests/functional/pipelines/run_test.py --pipeline_version 2.0 --sdk_version v2 --sdk_version_param PipelineFactory',
+          'tests/functional/pipelines/run_test.py --pipeline_version 3.0 --sdk_version v1 --sdk_version_param PipelineFactory',
+          'tests/functional/pipelines/run_test.py --pipeline_version 3.0 --sdk_version v2 --sdk_version_param PipelineFactory',
+          'tests/functional/pipelines/designer_test.py',
+          'tests/functional/pipelines/create_test.py',
+          'tests/functional/finetune --sdk_version v1 --sdk_version_param FinetuneFactory',
+          'tests/functional/finetune --sdk_version v2 --sdk_version_param FinetuneFactory',
+          'tests/functional/general_assets',
+          'tests/functional/apikey',
+          'tests/functional/agent tests/functional/team_agent',
+        ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -21,54 +40,26 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.8"
-
+          cache: 'pip'
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install ".[test]"
+
       - name: Set environment variables
         run: |
-          echo "TEAM_API_KEY=${{ secrets.TEAM_API_KEY_PROD }}" >> $GITHUB_ENV
-          echo "BACKEND_URL=https://platform-api.aixplain.com" >> $GITHUB_ENV
-          echo "MODELS_RUN_URL=https://models.aixplain.com/api/v1/execute" >> $GITHUB_ENV
-          echo "PIPELINES_RUN_URL=https://platform-api.aixplain.com/assets/pipeline/execution/run" >> $GITHUB_ENV
-
-      - name: Run Unit Tests
-        continue-on-error: true
-        run: python -m pytest tests/unit
-
-      - name: Run General Assets
-        continue-on-error: true
-        run: python -m pytest tests/functional/general_assets
-
-      - name: Run File Asset
-        continue-on-error: true
-        run: python -m pytest tests/functional/file_asset
-
-      - name: Run Agent
-        continue-on-error: true
-        run: python -m pytest tests/functional/agent
-
-      - name: Run Team Agent
-        continue-on-error: true
-        run: python -m pytest tests/functional/team_agent
-
-      - name: Run Data
-        continue-on-error: true
-        run: python -m pytest tests/functional/data_asset
-
-      - name: Run Benchmark
-        continue-on-error: true
-        run: python -m pytest tests/functional/benchmark
-
-      - name: Run Pipelines
-        continue-on-error: true
-        run: python -m pytest tests/functional/pipelines
-
-      - name: Run Api Key
-        continue-on-error: true
-        run: python -m pytest tests/functional/apikey
-
-      - name: Run Finetuner
-        continue-on-error: true
-        run: python -m pytest tests/functional/finetune
+          if [ "${{ github.ref_name }}" = "refs/heads/main" ]; then
+            echo "TEAM_API_KEY=${{ secrets.TEAM_API_KEY_PROD }}" >> $GITHUB_ENV
+            echo "BACKEND_URL=https://platform-api.aixplain.com" >> $GITHUB_ENV
+            echo "MODELS_RUN_URL=https://models.aixplain.com/api/v1/execute" >> $GITHUB_ENV
+            echo "PIPELINES_RUN_URL=https://platform-api.aixplain.com/assets/pipeline/execution/run" >> $GITHUB_ENV
+          else
+            echo "TEAM_API_KEY=${{ secrets.TEAM_API_KEY }}" >> $GITHUB_ENV
+            echo "BACKEND_URL=https://test-platform-api.aixplain.com" >> $GITHUB_ENV
+            echo "MODELS_RUN_URL=https://test-models.aixplain.com/api/v1/execute" >> $GITHUB_ENV
+            echo "PIPELINES_RUN_URL=https://test-platform-api.aixplain.com/assets/pipeline/execution/run" >> $GITHUB_ENV
+          fi
+
+      - name: Run Tests
+        run: python -m pytest ${{ matrix.test-suite}}

aixplain/enums/embedding_model.py

@@ -25,6 +25,11 @@ class EmbeddingModel(Enum):
     OPENAI_ADA002 = "6734c55df127847059324d9e"
     SNOWFLAKE_ARCTIC_EMBED_L_V2_0 = "678a4f8547f687504744960a"
     JINA_CLIP_V2_MULTIMODAL = "67c5f705d8f6a65d6f74d732"
+    MULTILINGUAL_E5_LARGE = "67efd0772a0a850afa045af3"
+    BGE_M3 = "67f401032a0a850afa045b19"
+
+
+
 
     def __str__(self):
         return self._value_

aixplain/factories/agent_factory/__init__.py

@@ -81,9 +81,9 @@ def create(
             Agent: created Agent
         """
         warnings.warn(
-            "The 'instructions' parameter was recently added and serves the same purpose as 'description' did previously: set the role of the agent as a system prompt. "
-            "The 'description' parameter is still required and should be used to set a short summary of the agent's purpose. "
-            "For the next releases, the 'instructions' parameter will be required.",
+            "Use `instructions` to define the **system prompt**. "
+            "Use `description` to provide a **short summary** of the agent for metadata and dashboard display. "
+            "Note: In upcoming releases, `instructions` will become a required parameter.",
             UserWarning,
         )
         from aixplain.factories.agent_factory.utils import build_agent

aixplain/factories/agent_factory/utils.py

@@ -37,8 +37,15 @@ def build_tool(tool: Dict):
                 ]:
                     supplier = supplier_
                     break
+        assert "function" in tool, "Function is required for model tools"
+        function_name = tool.get("function")
+        try:
+            function = Function(function_name)
+        except ValueError:
+            valid_functions = [func.value for func in Function]
+            raise ValueError(f"Function {function_name} is not a valid function. The valid functions are: {valid_functions}")
         tool = ModelTool(
-            function=Function(tool.get("function", None)),
+            function=function,
             supplier=supplier,
             version=tool["version"],
             model=tool["assetId"],
@@ -63,7 +70,7 @@ def build_tool(tool: Dict):
             description=tool["description"], database=database, schema=schema, tables=tables, enable_commit=enable_commit
         )
     else:
-        raise Exception("Agent Creation Error: Tool type not supported.")
+        raise ValueError("Agent Creation Error: Tool type not supported.")
 
     return tool
 
@@ -77,6 +84,9 @@ def build_agent(payload: Dict, tools: List[Tool] = None, api_key: Text = config.
         for tool in tools_dict:
             try:
                 payload_tools.append(build_tool(tool))
+            except (ValueError, AssertionError) as e:
+                logging.warning(str(e))
+                continue
             except Exception:
                 logging.warning(
                     f"Tool {tool['assetId']} is not available. Make sure it exists or you have access to it. "

aixplain/factories/model_factory/utils.py

@@ -4,7 +4,7 @@
 from aixplain.modules.model.llm_model import LLM
 from aixplain.modules.model.index_model import IndexModel
 from aixplain.modules.model.utility_model import UtilityModel, UtilityModelInput
-from aixplain.enums import DataType, Function, Language, OwnershipType, Supplier, SortBy, SortOrder
+from aixplain.enums import DataType, Function, Language, OwnershipType, Supplier, SortBy, SortOrder, AssetStatus
 from aixplain.utils import config
 from aixplain.utils.file_utils import _request_with_retry
 from datetime import datetime
@@ -80,6 +80,7 @@ def create_model_from_response(response: Dict) -> Model:
         version=response["version"]["id"],
         inputs=inputs,
         temperature=temperature,
+        status=response.get("status", AssetStatus.DRAFT),
     )