agenta 0.48.9__py3-none-any.whl → 0.49.0__py3-none-any.whl

agenta/sdk/litellm/mocks/__init__.py

@@ -3,6 +3,8 @@ from asyncio import sleep
 
 from pydantic import BaseModel
 
+import agenta as ag
+
 
 class MockMessageModel(BaseModel):
     content: str
@@ -16,6 +18,7 @@ class MockResponseModel(BaseModel):
     choices: list[MockChoiceModel]
 
 
+@ag.instrument()
 def hello_mock_response(*args, **kwargs) -> MockResponseModel:
     return MockResponseModel(
         choices=[
@@ -28,6 +31,7 @@ def hello_mock_response(*args, **kwargs) -> MockResponseModel:
     )
 
 
+@ag.instrument()
 def chat_mock_response(*args, **kwargs) -> MockResponseModel:
     return MockResponseModel(
         choices=[
@@ -41,6 +45,7 @@ def chat_mock_response(*args, **kwargs) -> MockResponseModel:
     )
 
 
+@ag.instrument()
 def delay_mock_response(*args, **kwargs) -> MockResponseModel:
     sleep(2)
 
@@ -55,8 +60,147 @@ def delay_mock_response(*args, **kwargs) -> MockResponseModel:
     )
 
 
+@ag.instrument()
+def capital_mock_response(*args, **kwargs) -> MockResponseModel:
+    country = kwargs.get("messages", [{}, {}])[1].get(
+        "content", "What is the capital of _____?"
+    )[len("What is the capital of ") :][:-1]
+
+    capital = CAPITALS.get(country, "Unknown")
+    return MockResponseModel(
+        choices=[
+            MockChoiceModel(
+                message=MockMessageModel(
+                    content=f"The capital of {country} is {capital}.",
+                )
+            )
+        ],
+    )
+
+
 MOCKS: dict[str, Callable[..., MockResponseModel]] = {
     "hello": hello_mock_response,
     "chat": chat_mock_response,
     "delay": delay_mock_response,
+    "capital": capital_mock_response,
+}
+
+CAPITALS = {
+    "Afghanistan": "Kabul",
+    "Albania": "Tirana",
+    "Algeria": "Algiers",
+    "Andorra": "Andorra la Vella",
+    "Angola": "Luanda",
+    "Antigua and Barbuda": "St. John's",
+    "Argentina": "Buenos Aires",
+    "Armenia": "Yerevan",
+    "Australia": "Canberra",
+    "Austria": "Vienna",
+    "Azerbaijan": "Baku",
+    "Bahamas": "Nassau",
+    "Bahrain": "Manama",
+    "Bangladesh": "Dhaka",
+    "Barbados": "Bridgetown",
+    "Belarus": "Minsk",
+    "Belgium": "Brussels",
+    "Belize": "Belmopan",
+    "Benin": "Porto-Novo",
+    "Bhutan": "Thimphu",
+    "Bolivia": "Sucre",
+    "Bosnia and Herzegovina": "Sarajevo",
+    "Botswana": "Gaborone",
+    "Brazil": "Bras\u00edlia",
+    "Brunei": "Bandar Seri Begawan",
+    "Bulgaria": "Sofia",
+    "Burkina Faso": "Ouagadougou",
+    "Burundi": "Gitega",
+    "Cabo Verde": "Praia",
+    "Cambodia": "Phnom Penh",
+    "Cameroon": "Yaound\u00e9",
+    "Canada": "Ottawa",
+    "Central African Republic": "Bangui",
+    "Chad": "N'Djamena",
+    "Chile": "Santiago",
+    "China": "Beijing",
+    "Colombia": "Bogot\u00e1",
+    "Comoros": "Moroni",
+    "Congo (Brazzaville)": "Brazzaville",
+    "Congo (Kinshasa)": "Kinshasa",
+    "Costa Rica": "San Jos\u00e9",
+    "Croatia": "Zagreb",
+    "Cuba": "Havana",
+    "Cyprus": "Nicosia",
+    "Czech Republic": "Prague",
+    "Denmark": "Copenhagen",
+    "Djibouti": "Djibouti",
+    "Dominica": "Roseau",
+    "Dominican Republic": "Santo Domingo",
+    "East Timor": "Dili",
+    "Ecuador": "Quito",
+    "Egypt": "Cairo",
+    "El Salvador": "San Salvador",
+    "Equatorial Guinea": "Malabo",
+    "Eritrea": "Asmara",
+    "Estonia": "Tallinn",
+    "Eswatini": "Mbabane",
+    "Ethiopia": "Addis Ababa",
+    "Fiji": "Suva",
+    "Finland": "Helsinki",
+    "France": "Paris",
+    "Gabon": "Libreville",
+    "Gambia": "Banjul",
+    "Georgia": "Tbilisi",
+    "Germany": "Berlin",
+    "Ghana": "Accra",
+    "Greece": "Athens",
+    "Grenada": "St. George's",
+    "Guatemala": "Guatemala City",
+    "Guinea": "Conakry",
+    "Guinea-Bissau": "Bissau",
+    "Guyana": "Georgetown",
+    "Haiti": "Port-au-Prince",
+    "Honduras": "Tegucigalpa",
+    "Hungary": "Budapest",
+    "Iceland": "Reykjavik",
+    "India": "New Delhi",
+    "Indonesia": "Jakarta",
+    "Iran": "Tehran",
+    "Iraq": "Baghdad",
+    "Ireland": "Dublin",
+    "Israel": "Jerusalem",
+    "Italy": "Rome",
+    "Ivory Coast": "Yamoussoukro",
+    "Jamaica": "Kingston",
+    "Japan": "Tokyo",
+    "Jordan": "Amman",
+    "Kazakhstan": "Astana",
+    "Kenya": "Nairobi",
+    "Kiribati": "South Tarawa",
+    "North Korea": "Pyongyang",
+    "South Korea": "Seoul",
+    "Kosovo": "Pristina",
+    "Kuwait": "Kuwait City",
+    "Kyrgyzstan": "Bishkek",
+    "Laos": "Vientiane",
+    "Latvia": "Riga",
+    "Lebanon": "Beirut",
+    "Lesotho": "Maseru",
+    "Liberia": "Monrovia",
+    "Libya": "Tripoli",
+    "Liechtenstein": "Vaduz",
+    "Lithuania": "Vilnius",
+    "Luxembourg": "Luxembourg",
+    "Madagascar": "Antananarivo",
+    "Malawi": "Lilongwe",
+    "Malaysia": "Kuala Lumpur",
+    "Maldives": "Mal\u00e9",
+    "Mali": "Bamako",
+    "Malta": "Valletta",
+    "Marshall Islands": "Majuro",
+    "Mauritania": "Nouakchott",
+    "Mauritius": "Port Louis",
+    "Mexico": "Mexico City",
+    "Micronesia": "Palikir",
+    "Moldova": "Chi\u0219in\u0103u",
+    "Monaco": "Monaco",
 }

agenta/sdk/middleware/auth.py

@@ -100,8 +100,8 @@ class AuthMiddleware(BaseHTTPMiddleware):
             access_token = request.cookies.get("sAccessToken", None)
             cookies = {"sAccessToken": access_token} if access_token else None
 
-            if not headers and not cookies:
-                log.debug("No auth header nor auth cookie found in the request")
+            # if not headers and not cookies:
+            #     log.debug("No auth header nor auth cookie found in the request")
 
             # PARAMS
             params = {}
@@ -112,8 +112,9 @@ class AuthMiddleware(BaseHTTPMiddleware):
                 # ALTERNATIVE
                 or request.query_params.get("project_id")
             )
-            if not project_id:
-                log.debug("No project ID found in request")
+            # if not project_id:
+            #     log.debug("No project ID found in request")
+
             if project_id:
                 params["project_id"] = project_id
             ## SCOPE
@@ -139,7 +140,7 @@ class AuthMiddleware(BaseHTTPMiddleware):
                 credentials = _cache.get(_hash)
 
                 if credentials:
-                    log.debug("Using cached credentials")
+                    # log.debug("Using cached credentials")
                     return credentials
 
             try:
@@ -153,46 +154,46 @@ class AuthMiddleware(BaseHTTPMiddleware):
                             timeout=30.0,
                         )
                     except httpx.TimeoutException as exc:
-                        log.debug(f"Timeout error while verify credentials: {exc}")
+                        # log.debug(f"Timeout error while verify credentials: {exc}")
                         raise DenyException(
                             status_code=504,
                             content="Could not verify credentials: connection to {self.host} timed out. Please check your network connection.",
                         ) from exc
                     except httpx.ConnectError as exc:
-                        log.debug(f"Connection error while verify credentials: {exc}")
+                        # log.debug(f"Connection error while verify credentials: {exc}")
                         raise DenyException(
                             status_code=503,
                             content=f"Could not verify credentials: connection to {self.host} failed. Please check if agenta is available.",
                         ) from exc
                     except httpx.NetworkError as exc:
-                        log.debug(f"Network error while verify credentials: {exc}")
+                        # log.debug(f"Network error while verify credentials: {exc}")
                         raise DenyException(
                             status_code=503,
                             content="Could not verify credentials: connection to {self.host} failed. Please check your network connection.",
                         ) from exc
                     except httpx.HTTPError as exc:
-                        log.debug(f"HTTP error while verify credentials: {exc}")
+                        # log.debug(f"HTTP error while verify credentials: {exc}")
                         raise DenyException(
                             status_code=502,
                             content=f"Could not verify credentials: connection to {self.host} failed. Please check if agenta is available.",
                         ) from exc
 
                     if response.status_code == 401:
-                        log.debug("Agenta returned 401 - Invalid credentials")
+                        # log.debug("Agenta returned 401 - Invalid credentials")
                         raise DenyException(
                             status_code=401,
                             content="Invalid credentials. Please check your credentials or login again.",
                         )
                     elif response.status_code == 403:
-                        log.debug("Agenta returned 403 - Permission denied")
+                        # log.debug("Agenta returned 403 - Permission denied")
                         raise DenyException(
                             status_code=403,
                             content="Permission denied. Please check your permissions or contact your administrator.",
                         )
                     elif response.status_code != 200:
-                        log.debug(
-                            f"Agenta returned {response.status_code} - Unexpected status code"
-                        )
+                        # log.debug(
+                        #     f"Agenta returned {response.status_code} - Unexpected status code"
+                        # )
                         raise DenyException(
                             status_code=500,
                             content=f"Could not verify credentials: {self.host} returned unexpected status code {response.status_code}. Please try again later or contact support if the issue persists.",
@@ -201,16 +202,16 @@ class AuthMiddleware(BaseHTTPMiddleware):
                     try:
                         auth = response.json()
                     except ValueError as exc:
-                        log.debug(f"Agenta returned invalid JSON response: {exc}")
+                        # log.debug(f"Agenta returned invalid JSON response: {exc}")
                         raise DenyException(
                             status_code=500,
                             content=f"Could not verify credentials: {self.host} returned unexpected invalid JSON response. Please try again later or contact support if the issue persists.",
                         ) from exc
 
                     if not isinstance(auth, dict):
-                        log.debug(
-                            f"Agenta returned invalid response format: {type(auth)}"
-                        )
+                        # log.debug(
+                        #     f"Agenta returned invalid response format: {type(auth)}"
+                        # )
                         raise DenyException(
                             status_code=500,
                             content=f"Could not verify credentials: {self.host} returned unexpected invalid response format. Please try again later or contact support if the issue persists.",
@@ -218,7 +219,7 @@ class AuthMiddleware(BaseHTTPMiddleware):
 
                     effect = auth.get("effect")
                     if effect != "allow":
-                        log.debug("Access denied by Agenta - effect: {effect}")
+                        # log.debug("Access denied by Agenta - effect: {effect}")
                         raise DenyException(
                             status_code=403,
                             content="Permission denied. Please check your permissions or contact your administrator.",
@@ -226,8 +227,8 @@ class AuthMiddleware(BaseHTTPMiddleware):
 
                     credentials = auth.get("credentials")
 
-                    if not credentials:
-                        log.debug("No credentials found in the response")
+                    # if not credentials:
+                    #     log.debug("No credentials found in the response")
 
                     _cache.put(_hash, credentials)
 
@@ -236,9 +237,9 @@ class AuthMiddleware(BaseHTTPMiddleware):
             except DenyException as deny:
                 raise deny
             except Exception as exc:  # pylint: disable=bare-except
-                log.debug(
-                    f"Unexpected error while verifying credentials (remote): {exc}"
-                )
+                # log.debug(
+                #     f"Unexpected error while verifying credentials (remote): {exc}"
+                # )
                 raise DenyException(
                     status_code=500,
                     content=f"Could not verify credentials: unexpected error - {str(exc)}. Please try again later or contact support if the issue persists.",
@@ -247,7 +248,7 @@ class AuthMiddleware(BaseHTTPMiddleware):
         except DenyException as deny:
             raise deny
         except Exception as exc:
-            log.debug(f"Unexpected error while verifying credentials (local): {exc}")
+            # log.debug(f"Unexpected error while verifying credentials (local): {exc}")
             raise DenyException(
                 status_code=500,
                 content=f"Could not verify credentials: unexpected error - {str(exc)}. Please try again later or contact support if the issue persists.",

agenta/sdk/types.py

@@ -481,6 +481,26 @@ class PromptTemplate(BaseModel):
                 f"Error formatting template '{content}': {str(e)}", original_error=e
             )
 
+    def _substitute_variables(self, obj: Any, kwargs: Dict[str, Any]) -> Any:
+        """Recursively substitute variables within strings of a JSON-like object.
+
+        This now processes placeholders in both keys and values so that
+        structures like ``{"my_{{var}}": "{{val}}"}`` are fully substituted.
+        """
+        if isinstance(obj, str):
+            return self._format_with_template(obj, kwargs)
+        if isinstance(obj, list):
+            return [self._substitute_variables(item, kwargs) for item in obj]
+        if isinstance(obj, dict):
+            new_dict = {}
+            for k, v in obj.items():
+                new_key = (
+                    self._format_with_template(k, kwargs) if isinstance(k, str) else k
+                )
+                new_dict[new_key] = self._substitute_variables(v, kwargs)
+            return new_dict
+        return obj
+
     def format(self, **kwargs) -> "PromptTemplate":
         """
         Format the template with provided inputs.
@@ -533,10 +553,17 @@ class PromptTemplate(BaseModel):
                 )
             )
 
+        new_llm_config = self.llm_config.copy(deep=True)
+        if new_llm_config.response_format is not None:
+            rf_dict = new_llm_config.response_format.model_dump(by_alias=True)
+            substituted = self._substitute_variables(rf_dict, kwargs)
+            rf_type = type(new_llm_config.response_format)
+            new_llm_config.response_format = rf_type(**substituted)
+
         return PromptTemplate(
             messages=new_messages,
             template_format=self.template_format,
-            llm_config=self.llm_config,
+            llm_config=new_llm_config,
             input_keys=self.input_keys,
         )
 

{agenta-0.48.9.dist-info → agenta-0.49.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agenta
-Version: 0.48.9
+Version: 0.49.0
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Keywords: LLMOps,LLM,evaluation,prompt engineering
 Author: Mahmoud Mabrouk