Eng 711 new model endpoints

aixplain/modules/model/__init__.py

@@ -205,7 +205,7 @@ def run(
         """
         start = time.time()
         payload = build_payload(data=data, parameters=parameters)
-        url = f"{self.url}/api/v2/execute/{self.id}"
+        url = f"{self.url}/{self.id}".replace("api/v1/execute", "api/v2/execute")
         logging.debug(f"Model Run Sync: Start service for {name} - {url}")
         response = call_run_endpoint(payload=payload, url=url, api_key=self.api_key)
         if response["status"] == "IN_PROGRESS":
@@ -231,7 +231,7 @@ def run_async(self, data: Union[Text, Dict], name: Text = "model_process", param
         Returns:
             dict: polling URL in response
         """
-        url = f"{self.url}/api/v1/execute/{self.id}"
+        url = f"{self.url}/{self.id}"
         logging.debug(f"Model Run Async: Start service for {name} - {url}")
         payload = build_payload(data=data, parameters=parameters)
         response = call_run_endpoint(payload=payload, url=url, api_key=self.api_key)

aixplain/modules/model/llm_model.py

@@ -135,7 +135,7 @@ def run(
             }
         )
         payload = build_payload(data=data, parameters=parameters)
-        url = f"{self.url}/api/v2/execute/{self.id}"
+        url = f"{self.url}/{self.id}".replace("/api/v1/execute", "/api/v2/execute")
         logging.debug(f"Model Run Sync: Start service for {name} - {url}")
         response = call_run_endpoint(payload=payload, url=url, api_key=self.api_key)
         if response["status"] == "IN_PROGRESS":
@@ -178,7 +178,7 @@ def run_async(
         Returns:
             dict: polling URL in response
         """
-        url = f"{self.url}/api/v1/execute/{self.id}"
+        url = f"{self.url}/{self.id}"
         logging.debug(f"Model Run Async: Start service for {name} - {url}")
         parameters.update(
             {

tests/unit/llm_test.py

@@ -38,7 +38,7 @@
 def test_run_async_errors(status_code, error_message):
     base_url = config.MODELS_RUN_URL
     llm_id = "llm-id"
-    execute_url = f"{base_url}/api/v1/execute/{llm_id}"
+    execute_url = f"{base_url}/{llm_id}"
     ref_response = {
         "error": "An unspecified error occurred while processing your request.",
     }

tests/unit/model_test.py

@@ -43,7 +43,7 @@ def test_build_payload():
 def test_call_run_endpoint_async():
     base_url = config.MODELS_RUN_URL
     model_id = "model-id"
-    execute_url = f"{base_url}/api/v1/execute/{model_id}"
+    execute_url = f"{base_url}/{model_id}"
     payload = {"data": "input_data"}
     ref_response = {
         "completed": True,
@@ -64,15 +64,14 @@ def test_call_run_endpoint_async():
 def test_call_run_endpoint_sync():
     base_url = config.MODELS_RUN_URL
     model_id = "model-id"
-    execute_url = f"{base_url}/api/v1/execute/{model_id}"
+    execute_url = f"{base_url}/{model_id}".replace("/api/v1/execute", "/api/v2/execute")
     payload = {"data": "input_data"}
     ref_response = {"completed": True, "status": "SUCCESS", "data": "Hello"}
 
     with requests_mock.Mocker() as mock:
         mock.post(execute_url, json=ref_response)
         response = call_run_endpoint(url=execute_url, api_key=config.TEAM_API_KEY, payload=payload)
 
-    print(response)
     assert response["completed"] == ref_response["completed"]
     assert response["status"] == ref_response["status"]
     assert response["data"] == ref_response["data"]
@@ -139,7 +138,7 @@ def test_failed_poll():
 def test_run_async_errors(status_code, error_message):
     base_url = config.MODELS_RUN_URL
     model_id = "model-id"
-    execute_url = f"{base_url}/api/v1/execute/{model_id}"
+    execute_url = f"{base_url}/{model_id}"
     ref_response = {
         "error": "An unspecified error occurred while processing your request.",
     }