agenta 0.56.2__tar.gz → 0.56.3__tar.gz

{agenta-0.56.2 → agenta-0.56.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agenta
-Version: 0.56.2
+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.2 → agenta-0.56.3}/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-0.56.2 → agenta-0.56.3}/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-0.56.2 → agenta-0.56.3}/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.2 → agenta-0.56.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.56.2"
+version = "0.56.3"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = [