agenta 0.56.1__py3-none-any.whl → 0.56.3__py3-none-any.whl

agenta/client/backend/vault/raw_client.py

@@ -39,7 +39,7 @@ class RawVaultClient:
             Successful Response
         """
         _response = self._client_wrapper.httpx_client.request(
-            "vault/v1/secrets",
+            "vault/v1/secrets/",
             method="GET",
             request_options=request_options,
         )
@@ -89,7 +89,7 @@ class RawVaultClient:
             Successful Response
         """
         _response = self._client_wrapper.httpx_client.request(
-            "vault/v1/secrets",
+            "vault/v1/secrets/",
             method="POST",
             json={
                 "header": convert_and_respect_annotation_metadata(
@@ -337,7 +337,7 @@ class AsyncRawVaultClient:
             Successful Response
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "vault/v1/secrets",
+            "vault/v1/secrets/",
             method="GET",
             request_options=request_options,
         )
@@ -387,7 +387,7 @@ class AsyncRawVaultClient:
             Successful Response
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "vault/v1/secrets",
+            "vault/v1/secrets/",
             method="POST",
             json={
                 "header": convert_and_respect_annotation_metadata(

agenta/sdk/middleware/config.py

@@ -93,13 +93,18 @@ class ConfigMiddleware(BaseHTTPMiddleware):
 
                 return parameters, references
 
-        config = {}
+        config = dict()
+        app_ref = None
 
         is_test_path = request.url.path.endswith("/test")
         are_refs_missing = not variant_ref and not environment_ref
-        should_fetch = not is_test_path or not are_refs_missing
+        should_fetch_application_revision = not is_test_path or not are_refs_missing
+        is_app_ref_incomplete = (
+            application_ref and application_ref.id and not application_ref.slug
+        )
+        should_fetch_application = is_app_ref_incomplete
 
-        if should_fetch:
+        if should_fetch_application_revision:
             async with httpx.AsyncClient() as client:
                 response = await client.post(
                     f"{self.host}/api/variants/configs/fetch",
@@ -110,13 +115,26 @@ class ConfigMiddleware(BaseHTTPMiddleware):
                 if response.status_code == 200:
                     config = response.json()
 
-        if not config:
-            config["application_ref"] = refs[
-                "application_ref"
-            ]  # by default, application_ref will always have an id
-            parameters = None
-        else:
+        elif should_fetch_application:
+            async with httpx.AsyncClient() as client:
+                response = await client.get(
+                    f"{self.host}/api/apps/{application_ref.id}",
+                    headers=headers,
+                )
+
+                if response.status_code == 200:
+                    app = response.json()
+                    app_ref = {
+                        "id": app.get("app_id"),
+                        "slug": app.get("app_name"),
+                    }
+
+        if config:
             parameters = config.get("params")
+        else:
+            # by default, application_ref will always have an id
+            config["application_ref"] = app_ref or refs["application_ref"]
+            parameters = None
 
         references = {}
 

agenta/sdk/middleware/vault.py

@@ -101,7 +101,7 @@ class VaultMiddleware(BaseHTTPMiddleware):
         try:
             async with httpx.AsyncClient() as client:
                 response = await client.get(
-                    f"{self.host}/api/vault/v1/secrets",
+                    f"{self.host}/api/vault/v1/secrets/",
                     headers=headers,
                 )
 

agenta/sdk/tracing/attributes.py

@@ -6,7 +6,7 @@ PrimitivesSequence = Sequence[Primitive]
 Attribute = Union[Primitive, PrimitivesSequence]
 
 
-def _marshal(
+def _marshall(
     unmarshalled: Dict[str, Any],
     *,
     parent_key: Optional[str] = "",
@@ -59,7 +59,7 @@ def _marshal(
             dict_key = child_key
 
             marshalled.update(
-                _marshal(
+                _marshall(
                     value,
                     parent_key=dict_key,
                     depth=depth + 1,
@@ -76,7 +76,7 @@ def _marshal(
 
                     if isinstance(item, (dict, list)):
                         marshalled.update(
-                            _marshal(
+                            _marshall(
                                 item,
                                 parent_key=list_key,
                                 depth=depth + 1,
@@ -177,7 +177,7 @@ def serialize(
         k: v
         for k, v in {
             _encode_key(namespace, key): _encode_value(value)
-            for key, value in _marshal(attributes, max_depth=max_depth).items()
+            for key, value in _marshall(attributes, max_depth=max_depth).items()
         }.items()
         if v is not None
     }

agenta/sdk/tracing/inline.py

@@ -532,11 +532,11 @@ from json import loads, JSONDecodeError, dumps
 from copy import copy
 
 
-def _unmarshal_attributes(
+def _unmarshall_attributes(
     marshalled: Dict[str, Any],
 ) -> Dict[str, Any]:
     """
-    Unmarshals a dictionary of marshalled attributes into a nested dictionary
+    Unmarshalls a dictionary of marshalled attributes into a nested dictionary
 
     Example:
     marshalled = {
@@ -566,42 +566,34 @@ def _unmarshal_attributes(
 
     for key, value in marshalled.items():
         keys = key.split(".")
-
-        level = unmarshalled
-
-        for i, part in enumerate(keys[:-1]):
-            if part.isdigit():
-                part = int(part)
-
-                if not isinstance(level, list):
-                    level = []
-
-                while len(level) <= part:
-                    level.append({})
-
-                level = level[part]
-
+        current = unmarshalled
+
+        for i, key in enumerate(keys):
+            is_last = i == len(keys) - 1
+            next_key = keys[i + 1] if not is_last else None
+            is_index = key.isdigit()
+            key = int(key) if is_index else key
+
+            if is_last:
+                if isinstance(current, list) and isinstance(key, int):
+                    while len(current) <= key:
+                        current.append(None)
+                    current[key] = value
+                elif isinstance(current, dict):
+                    current[key] = value
             else:
-                if part not in level:
-                    level[part] = {} if not keys[i + 1].isdigit() else []
-
-                level = level[part]
-
-        last_key = keys[-1]
-
-        if last_key.isdigit():
-            last_key = int(last_key)
-
-            if not isinstance(level, list):
-                level = []
-
-            while len(level) <= last_key:
-                level.append(None)
-
-            level[last_key] = value
-
-        else:
-            level[last_key] = value
+                next_is_index = next_key.isdigit() if next_key else False
+
+                if isinstance(current, list) and isinstance(key, int):
+                    while len(current) <= key:
+                        current.append([] if next_is_index else {})
+                    if current[key] is None:
+                        current[key] = [] if next_is_index else {}
+                    current = current[key]
+                elif isinstance(current, dict):
+                    if key not in current:
+                        current[key] = [] if next_is_index else {}
+                    current = current[key]
 
     return unmarshalled
 
@@ -750,7 +742,7 @@ def _parse_from_attributes(
     for key in _data.keys():
         del otel_span_dto.attributes[_encode_key("data", key)]
 
-    # _data = _unmarshal_attributes(_data)
+    # _data = _unmarshall_attributes(_data)
     _data = _data if _data else None
 
     # METRICS
@@ -759,7 +751,7 @@ def _parse_from_attributes(
     for key in _metrics.keys():
         del otel_span_dto.attributes[_encode_key("metrics", key)]
 
-    # _metrics = _unmarshal_attributes(_metrics)
+    # _metrics = _unmarshall_attributes(_metrics)
     _metrics = _metrics if _metrics else None
 
     # META
@@ -768,7 +760,7 @@ def _parse_from_attributes(
     for key in _meta.keys():
         del otel_span_dto.attributes[_encode_key("meta", key)]
 
-    # _meta = _unmarshal_attributes(_meta)
+    # _meta = _unmarshall_attributes(_meta)
     _meta = _meta if _meta else None
 
     # TAGS
@@ -904,7 +896,7 @@ def parse_to_agenta_span_dto(
 ) -> SpanDTO:
     # DATA
     if span_dto.data:
-        span_dto.data = _unmarshal_attributes(span_dto.data)
+        span_dto.data = _unmarshall_attributes(span_dto.data)
 
         if "outputs" in span_dto.data:
             if "__default__" in span_dto.data["outputs"]:
@@ -912,19 +904,19 @@ def parse_to_agenta_span_dto(
 
     # METRICS
     if span_dto.metrics:
-        span_dto.metrics = _unmarshal_attributes(span_dto.metrics)
+        span_dto.metrics = _unmarshall_attributes(span_dto.metrics)
 
     # META
     if span_dto.meta:
-        span_dto.meta = _unmarshal_attributes(span_dto.meta)
+        span_dto.meta = _unmarshall_attributes(span_dto.meta)
 
     # TAGS
     if span_dto.tags:
-        span_dto.tags = _unmarshal_attributes(span_dto.tags)
+        span_dto.tags = _unmarshall_attributes(span_dto.tags)
 
     # REFS
     if span_dto.refs:
-        span_dto.refs = _unmarshal_attributes(span_dto.refs)
+        span_dto.refs = _unmarshall_attributes(span_dto.refs)
 
     if isinstance(span_dto.links, list):
         for link in span_dto.links:

{agenta-0.56.1.dist-info → agenta-0.56.3.dist-info}/METADATA

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

{agenta-0.56.1.dist-info → agenta-0.56.3.dist-info}/RECORD

@@ -290,7 +290,7 @@ agenta/client/backend/variants/types/__init__.py,sha256=TVwvQoKg9uUo3mFSAhpvMEhC
 agenta/client/backend/variants/types/add_variant_from_base_and_config_response.py,sha256=KXnLr_ZwsEWvaamIlUqAjyu2X394WN4Xz82WX4dRXiQ,248
 agenta/client/backend/vault/__init__.py,sha256=ubAQC1MczTU-pkK0TqRAjY5X8buyQIlNZY2RuM4nJpc,84
 agenta/client/backend/vault/client.py,sha256=X8gzIHvAaFbe2acBcHXubnKP4olGgdZy6esxjzYt91M,11205
-agenta/client/backend/vault/raw_client.py,sha256=9C2pqxesrbS9QtVkXkeRl3Pxc8U-Usm0CFLjeqILVZA,21373
+agenta/client/backend/vault/raw_client.py,sha256=lL7q9lbCLypepKxA3H8TgVf2zXH1Wufz4XPIzek8QTY,21377
 agenta/client/backend/workflows/__init__.py,sha256=ubAQC1MczTU-pkK0TqRAjY5X8buyQIlNZY2RuM4nJpc,84
 agenta/client/backend/workflows/client.py,sha256=SVH3Iv3hp1QpXu2NOb8HusCeUzQZldrdAf3kEpCf2e8,63639
 agenta/client/backend/workflows/raw_client.py,sha256=fXK3b6Q20FETvFD5cYus6j7kcQ-IcnzzXQ11ujb4TWQ,127390
@@ -332,19 +332,19 @@ agenta/sdk/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 agenta/sdk/middleware/adapt.py,sha256=hRMwaCv_-6vA80YiYRA25ONl7WHEClmVgqnbHUYfwLQ,7195
 agenta/sdk/middleware/auth.py,sha256=bcg2MrCIqruVblbsNuSKZXXkutu0iRfSQp_AJZtJs14,16389
 agenta/sdk/middleware/base.py,sha256=V-yjdm0BioM3myD0DXOCXlvb_8WYKLwUcboAR8mG-IE,1064
-agenta/sdk/middleware/config.py,sha256=zd57kxaeYheZMG8nD5VOYgHXw8j9zRlFacuzCGHWeEA,7978
+agenta/sdk/middleware/config.py,sha256=0eKRkARI0fkXwmq3NNL4x7iOue0_xN3RQCgoHk8guTc,8723
 agenta/sdk/middleware/cors.py,sha256=q3r7lGkrIdMcT_vuhsburMcjG7pyl7w0ycxrIrGJ2e8,921
 agenta/sdk/middleware/flags.py,sha256=okku9RBmcD4Qka8XIsVqtroMDg-9IXevUwDiAA9whJg,990
 agenta/sdk/middleware/inline.py,sha256=ee8E4XBGcRSrHTvblqX1yRXuTN_sxLm7lY1jnywrBG8,901
 agenta/sdk/middleware/mock.py,sha256=bCUN9iJBxePyN9MBwBpJs-_iCNkUQeUjIIu3WElS1oQ,759
 agenta/sdk/middleware/otel.py,sha256=lHzhGUv4fq2RPuTPH2keJ16v-_cBUrLrTqWzHUmEVdI,1041
-agenta/sdk/middleware/vault.py,sha256=Sxd8y0yTMRIpT0r0iwYUNv3SVXTGUEcYf8RaXISIalQ,4058
+agenta/sdk/middleware/vault.py,sha256=sF2CmWQdCvXJcmZppT4duV0KgqHW4c4wg4Fs_i1SvNs,4059
 agenta/sdk/router.py,sha256=mOguvtOwl2wmyAgOuWTsf98pQwpNiUILKIo67W_hR3A,119
 agenta/sdk/tracing/__init__.py,sha256=rQNe5-zT5Kt7_CDhq-lnUIi1EYTBVzVf_MbfcIxVD98,41
-agenta/sdk/tracing/attributes.py,sha256=DwjjOk3mGOvz0jYu8EYr3hhItvawK5GX80_MfciqPrc,5559
+agenta/sdk/tracing/attributes.py,sha256=Brqle9hGV3DaEJjeYCBq7MDlbvHMAIwmkUj2Lni8dF4,5563
 agenta/sdk/tracing/conventions.py,sha256=JBtznBXZ3aRkGKkLl7cPwdMNh3w1G-H2Ta2YrAxbr38,950
 agenta/sdk/tracing/exporters.py,sha256=b1Aq5AcQYnmAxapQMYpN_MfaLOG4IGTzlQw3PfBiKgI,3486
-agenta/sdk/tracing/inline.py,sha256=y2S_MGGqmXgyUgbkNNyrb8_X-QtGuDy8JwxlwWibIx8,31507
+agenta/sdk/tracing/inline.py,sha256=UKt10JGKdS6gVDIpExng3UC8vegAcuA2KxlzyvSdUZ0,31886
 agenta/sdk/tracing/processors.py,sha256=ZE6baO2U3ER73rckvXhdbNmLgs3jn6le7iAUQc6osbY,5141
 agenta/sdk/tracing/propagation.py,sha256=EeOqDMqnh_MoEhGd1do_vy_tQBYUcoC8kpLqVoZeqg0,2561
 agenta/sdk/tracing/spans.py,sha256=nqUOjjirBxB8Eacv8Qj4Ra_6rknGi3lbJdNyKmk5ODQ,3707
@@ -366,6 +366,6 @@ agenta/sdk/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 agenta/sdk/workflows/registry.py,sha256=4FRSeU4njMmP6xFCIteF5f_W6NVlqFTx1AM7hsaGAQk,975
 agenta/sdk/workflows/types.py,sha256=SjYeT8FWVgwaIIC8sI3fRjKERLEA_oxuBGvYSaFqNg8,11720
 agenta/sdk/workflows/utils.py,sha256=ILfY8DSBWLrdWIuKg6mq7rANwKiiY6sxEeFiBFhjLYM,413
-agenta-0.56.1.dist-info/METADATA,sha256=1Rq5J7bPddrmALkGH_8k9M5rRElnzpRP-3PbGP3G3nw,31753
-agenta-0.56.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agenta-0.56.1.dist-info/RECORD,,
+agenta-0.56.3.dist-info/METADATA,sha256=VEW9AVDRDBrKZa_Mmd5dsgZ8e9fYWcgotpCMyHL0cto,31753
+agenta-0.56.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agenta-0.56.3.dist-info/RECORD,,