divi 0.0.1.dev15__py3-none-any.whl → 0.0.1.dev21__py3-none-any.whl

divi/__init__.py

@@ -12,5 +12,5 @@ _core: Optional[Core] = None
 _auth: Optional[Auth] = None
 _datapark: Optional[DataPark] = None
 
-__version__ = "0.0.1.dev15"
+__version__ = "0.0.1.dev21"
 __all__ = ["proto", "obs_openai", "observable"]

divi/decorators/observable.py

@@ -23,6 +23,7 @@ from divi.proto.trace.v1.trace_pb2 import ScopeSpans
 from divi.session import SessionExtra
 from divi.session.setup import setup
 from divi.signals.trace import Span
+from divi.utils import extract_flattened_inputs
 
 R = TypeVar("R", covariant=True)
 P = ParamSpec("P")
@@ -84,7 +85,8 @@ def observable(
             # recover parent context
             _SESSION_EXTRA.reset(token)
 
-            # TODO: collect result
+            # TODO: collect inputs and outputs
+            inputs = extract_flattened_inputs(func, *args, **kwargs)
             # create the span if it is the root span
             if divi._datapark and span.trace_id:
                 divi._datapark.create_spans(
@@ -98,9 +100,10 @@ def observable(
                     divi._datapark.upsert_traces(
                         session_id=trace.session_id, traces=[trace.signal]
                     )
+            # create the chat completion if it is a chat completion
             if divi._datapark and isinstance(result, ChatCompletion):
                 divi._datapark.create_chat_completion(
-                    span_id=span.span_id, completion=result
+                    span_id=span.span_id, inputs=inputs, completion=result
                 )
             return result
 

divi/proto/core/health/v1/health_service_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from divi.proto.core.health.v1 import health_service_pb2 as divi_dot_proto_dot_core_dot_health_dot_v1_dot_health__service__pb2
 
-GRPC_GENERATED_VERSION = '1.69.0'
+GRPC_GENERATED_VERSION = '1.71.0'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

divi/services/auth/auth.py

@@ -1,5 +1,3 @@
-import requests
-
 from divi.services.auth.tokman import Token
 from divi.services.service import Service
 
@@ -12,10 +10,4 @@ class Auth(Service):
 
     def auth_with_api_key(self) -> str:
         """Get the token with the API key."""
-        r = requests.post(
-            f"http://{self.target}/api/auth/api_key",
-            json={"api_key": self.api_key},
-        )
-        if r.status_code == 200:
-            return r.json()["data"]
-        raise ValueError(r.json()["message"])
+        return self.post("/api/auth/api_key", payload={"api_key": self.api_key})

divi/services/datapark/datapark.py

@@ -1,6 +1,8 @@
-import requests
+from typing import Any, Dict, TYPE_CHECKING
+from typing_extensions import Mapping
+
 from google.protobuf.json_format import MessageToDict
-from openai.types.chat.chat_completion import ChatCompletion
+from openai.types.chat import ChatCompletion
 from pydantic import UUID4
 
 import divi
@@ -8,6 +10,7 @@ from divi.proto.trace.v1.trace_pb2 import ScopeSpans
 from divi.services.service import Service
 from divi.session.session import SessionSignal
 from divi.signals.trace.trace import TraceSignal
+from openai import NotGiven
 
 
 class DataPark(Service):
@@ -18,46 +21,47 @@ class DataPark(Service):
         self.token = divi._auth.token
 
     @property
-    def headers(self):
+    def headers(self) -> Dict[str, str]:
         return {"Authorization": f"Bearer {self.token}"}
 
-    def create_session(self, session: SessionSignal):
-        r = requests.post(
-            f"http://{self.target}/api/session/",
-            headers=self.headers,
-            json=session,
-        )
-        if r.status_code != 201:
-            raise ValueError(r.json()["message"])
-
-    def upsert_traces(self, session_id: UUID4, traces: list[TraceSignal]):
-        r = requests.post(
-            f"http://{self.target}/api/session/{session_id}/traces",
-            headers=self.headers,
-            json=traces,
-        )
-        if r.status_code != 201:
-            raise ValueError(r.json()["message"])
-
-    def create_spans(self, trace_id: UUID4, spans: ScopeSpans):
-        r = requests.post(
-            f"http://{self.target}/api/trace/{trace_id}/spans",
-            headers=self.headers,
-            json=MessageToDict(spans),
-        )
-        if r.status_code != 201:
-            raise ValueError(r.json()["message"])
+    @staticmethod
+    def strip_not_given(obj: object | None) -> object:
+        """Remove all top-level keys where their values are instances of `NotGiven`"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, Mapping):
+            return obj
+
+        return {key: value for key, value in obj.items() if not isinstance(value, NotGiven)}
+
+    def create_session(self, session: SessionSignal) -> None:
+        self.post("/api/session/", payload=session)
+
+    def upsert_traces(
+        self, session_id: UUID4, traces: list[TraceSignal]
+    ) -> None:
+        self.post(f"/api/session/{session_id}/traces", payload=traces)
+
+    def create_spans(self, trace_id: UUID4, spans: ScopeSpans) -> None:
+        self.post(f"/api/trace/{trace_id}/spans", payload=MessageToDict(spans))
 
     def create_chat_completion(
-        self, span_id: bytes, completion: ChatCompletion
-    ):
-        r = requests.post(
-            f"http://{self.target}/api/v1/chat/completions",
-            headers=self.headers,
-            json={
-                "span_id": span_id.hex(),
-                "data": completion.model_dump(),
-            },
+        self,
+        span_id: bytes,
+        inputs: Dict[str, Any],
+        completion: ChatCompletion,
+    ) -> None:
+        hex_span_id = span_id.hex()
+        self.post_concurrent(
+            {
+                "/api/v1/chat/completions/input": {
+                    "span_id": hex_span_id,
+                    "data": self.strip_not_given(inputs),
+                },
+                "/api/v1/chat/completions": {
+                    "span_id": hex_span_id,
+                    "data": completion.model_dump(),
+                },
+            }
         )
-        if r.status_code != 201:
-            raise ValueError(r.json()["message"])

divi/services/service.py

@@ -1,3 +1,9 @@
+from concurrent.futures import ThreadPoolExecutor
+from typing import Any, Dict, Mapping, Sequence
+
+import requests
+
+
 class Service:
     """Service management class."""
 
@@ -9,3 +15,40 @@ class Service:
     def target(self) -> str:
         """Return the target string: host:port."""
         return f"{self.host}:{self.port}"
+
+    @property
+    def headers(self) -> Dict[str, str]:
+        """Override to provide default headers."""
+        return {}
+
+    def post(
+        self,
+        path: str,
+        payload: Mapping[str, Any] | Sequence[Mapping[str, Any]],
+    ) -> Any:
+        response = requests.post(
+            f"http://{self.target}{path}",
+            json=payload,
+            headers=self.headers,
+        )
+        if not 200 <= response.status_code < 300:
+            raise ValueError(
+                f"{path} failed: {response.json().get('message', 'Unknown error')}"
+            )
+        return response.json().get("data", response.json())
+
+    def post_concurrent(
+        self,
+        calls: Dict[str, Mapping[str, Any] | Sequence[Mapping[str, Any]]],
+    ) -> None:
+        with ThreadPoolExecutor(max_workers=len(calls)) as executor:
+            futures = [
+                executor.submit(
+                    self.post,
+                    path,
+                    payload,
+                )
+                for path, payload in calls.items()
+            ]
+            for future in futures:
+                future.result()

divi/utils.py

@@ -1,6 +1,33 @@
 import inspect
 import pathlib
-from typing import Callable
+from typing import Any, Callable, Dict
+
+
+def extract_flattened_inputs(
+    func: Callable, *args: Any, **kwargs: Any
+) -> Dict[str, Any]:
+    """
+    Extracts a flat dictionary of parameter names and values from a function call.
+    Handles default values, removes 'self' and 'cls', and flattens **kwargs.
+    """
+    signature = inspect.signature(func)
+    bound_args = signature.bind_partial(*args, **kwargs)
+    bound_args.apply_defaults()
+
+    arguments = dict(bound_args.arguments)
+    arguments.pop("self", None)
+    arguments.pop("cls", None)
+
+    for param_name, param in signature.parameters.items():
+        if (
+            param.kind == inspect.Parameter.VAR_KEYWORD
+            and param_name in arguments
+        ):
+            kwarg_dict = arguments.pop(param_name)
+            if isinstance(kwarg_dict, dict):
+                arguments.update(kwarg_dict)
+
+    return arguments
 
 
 def get_server_path() -> str:

{divi-0.0.1.dev15.dist-info → divi-0.0.1.dev21.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: divi
-Version: 0.0.1.dev15
+Version: 0.0.1.dev21
 Summary: The Agent Platform for Observability & Evaluation
 License-File: LICENSE
 Requires-Python: >=3.11
 Requires-Dist: grpcio>=1.71.0
+Requires-Dist: openai>=1.65.2
 Requires-Dist: protobuf<6.0.dev0,>=5.26.1
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: requests>=2.32.3

{divi-0.0.1.dev15.dist-info → divi-0.0.1.dev21.dist-info}/RECORD

@@ -1,16 +1,16 @@
-divi/__init__.py,sha256=RmQ9wc0IZRqR9DN6hACn0YMUrhHC_AJ9gXsKrgvkcWs,396
-divi/utils.py,sha256=3iVDogCjqQg0jEjhUKEuQ6vHPFp9w7kXNjSVwXt8KmI,574
+divi/__init__.py,sha256=-XjMcUmlsDSB_v0_rf5owoldPj1mXFoAgUaVZpyfwqk,396
+divi/utils.py,sha256=fXkjoyo_Lh8AZliKICOP460m0czUcNQjcEcceJbaOVA,1439
 divi/config/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 divi/decorators/__init__.py,sha256=HkyWdC1ctTsVFucCWCkj57JB4NmwONus1d2S2dUbvs4,110
 divi/decorators/obs_openai.py,sha256=4LtQPRgJPPyTOw1318Fi04WYqjIwGX8EP0YiWrTW0dk,1003
-divi/decorators/observable.py,sha256=N_MCX_HbMGpD7v_dxnK6ewhgONGxH4XBO-i-6ybGpkc,4038
+divi/decorators/observable.py,sha256=OZ0Ry6Q2sdZPAT_T5j2wSsM7g0nwDroxeSbP3nLMDvA,4250
 divi/proto/common/v1/common.proto,sha256=Rx8wr0_tOtQ1NseTMnsav4ApD1MDALzQDBA2IvLRTU0,1775
 divi/proto/common/v1/common_pb2.py,sha256=br61OHQVAi6SI3baFcb5xJv2Xd-AZ04A19xeSjLNMXo,2442
 divi/proto/common/v1/common_pb2.pyi,sha256=LmTpFFLxHg2a_qPIdNXXwGEMkbiDcTJdarR9eC-6Fq8,2133
 divi/proto/core/health/v1/health_service.proto,sha256=y39MNiwYiSqxb_JPQI7AmPfNNtP6pbX-WKTseMkjWUM,369
 divi/proto/core/health/v1/health_service_pb2.py,sha256=PKAxy_z7lU1HrwDNIa7AFHha9i8gICCVrcEhpOM79E0,1999
 divi/proto/core/health/v1/health_service_pb2.pyi,sha256=VbYHHTcp3epUVg0lTSxo3xpG52ZGhA7KKMRL5LR5e1c,691
-divi/proto/core/health/v1/health_service_pb2_grpc.py,sha256=6owvQ41KPqSOQ8WjXDjYsunoDVydJfP93vZ4uVSG59s,3953
+divi/proto/core/health/v1/health_service_pb2_grpc.py,sha256=YmlO94d-G71YBW1XZDSbYkwnHEUe6Z7R3_KAmoDWyA0,3953
 divi/proto/metric/v1/metric.proto,sha256=YHRMLUW-MtakHuibR3PJ0s2w5KgV12kc4737iHw0DTk,585
 divi/proto/metric/v1/metric_pb2.py,sha256=uvBhyy8QpaES3Jl82yVfsGazW5654XpRnsdGlpVgIRE,1974
 divi/proto/metric/v1/metric_pb2.pyi,sha256=S7ipsojkD7QZAYefDE4b3PO99Yzc6mOdtSLxH3-b67A,1304
@@ -20,9 +20,9 @@ divi/proto/trace/v1/trace_pb2.pyi,sha256=rPo2Oa3NWrINE_dyOVU9HUYHo5LY82Bm5TMenj5
 divi/services/__init__.py,sha256=TcVJ_gKxyPIcwhT9GgttqHeyk0icW44uE285KmUiyh4,185
 divi/services/finish.py,sha256=XKPKGJ5cWd5H95G_VpIOlOZOLrcf9StoTs7ayRic2jY,173
 divi/services/init.py,sha256=JVzRQ1m1DTHXFVGUMYnsv-vRvzCO8XFdR6MjIwOL_NY,433
-divi/services/service.py,sha256=1c7JQ49BSdBipGLfVIxTHaNxTuyvVAgrvxV7lyYv_68,285
+divi/services/service.py,sha256=539MhcYfMvsVGjDdu0UtYSZnL2cloaPeYeOSMl2eUy8,1532
 divi/services/auth/__init__.py,sha256=PIQ9rQ0jcRqcy03a3BOY7wbzwluIRG_4kI_H4J4mRFk,74
-divi/services/auth/auth.py,sha256=dTpFnNhxbEjzOkBLPQvRblFSO5tedJsdObWTXt84MaE,631
+divi/services/auth/auth.py,sha256=eRcE6Kq8jbBr6YL93HCGDIoga90SoZf3ogOAKeza9WY,445
 divi/services/auth/init.py,sha256=UXsOweatrWnuFO9ivSjEsJnHrK9YtStKYX2Nup64KEU,477
 divi/services/auth/tokman.py,sha256=V03wcV6TEy1k9o55teDVB9JZ3Ve2cJdwzWstQhWx4BQ,1070
 divi/services/core/__init__.py,sha256=FWl4ShX0AEnOyL24NEc9mNIVoQOeYO4q0qYX27L_Yyw,111
@@ -30,7 +30,7 @@ divi/services/core/core.py,sha256=PRwPtLgrgmCrejUfKf7HJNrAhGS0paFNZ7JwDToEUAk,12
 divi/services/core/finish.py,sha256=dIGQpVXcJY4-tKe7A1_VV3yoSHNCDPfOlUltvzvk6VI,231
 divi/services/core/init.py,sha256=e7-fgpOPglBXyEoPkgOAnpJk2ApdFbo7LPupxOb8N-w,1966
 divi/services/datapark/__init__.py,sha256=GbV1mwHE07yutgOlCIYHykSEL5KJ-ApgLutGMzu2eUE,86
-divi/services/datapark/datapark.py,sha256=J96C-K9RCaLT7oWXnMQOM1g7btfIlU7BMWReF3ePOlc,2055
+divi/services/datapark/datapark.py,sha256=1CoWJI2embzvijCmIIPwTLnliU4kSolUginGuSWHsBw,2182
 divi/services/datapark/init.py,sha256=C32f9t3eLsxcYNqEyheh6nW455G2oR0YhhdqBcbN3ec,92
 divi/session/__init__.py,sha256=6lYemv21VQCIHx-xIdi7BxXcPNxVdvE60--8ArReUew,82
 divi/session/session.py,sha256=ID7bQ4CuRPUcZ9S-DSjndiduslYFJukRLuCtChYm3wk,838
@@ -39,7 +39,7 @@ divi/session/teardown.py,sha256=YiBz_3yCiljMFEofZ60VmRL5sb8WA5GT7EYF8nFznZ4,133
 divi/signals/__init__.py,sha256=K1PaTAMwyBDsK6jJUg4QWy0xVJ_5MA6dlWiUyJeiSQA,44
 divi/signals/trace/__init__.py,sha256=K1PaTAMwyBDsK6jJUg4QWy0xVJ_5MA6dlWiUyJeiSQA,44
 divi/signals/trace/trace.py,sha256=y8Xio8Tp_e1tO8l_DAkUuzMrmENNKfIdklF0iWrjGYk,4547
-divi-0.0.1.dev15.dist-info/METADATA,sha256=pV_UinVgV7tlDH6lgD1eYH-k_enKQGKe_FTDhenmjWM,467
-divi-0.0.1.dev15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-divi-0.0.1.dev15.dist-info/licenses/LICENSE,sha256=5OJuZ4wMMEV0DgF0tofhAlS_KLkaUsZwwwDS2U_GwQ0,1063
-divi-0.0.1.dev15.dist-info/RECORD,,
+divi-0.0.1.dev21.dist-info/METADATA,sha256=xyAsE6Uj3sA8T7I83LVLtCEyum_hMQT4ULien2Q-0NU,497
+divi-0.0.1.dev21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+divi-0.0.1.dev21.dist-info/licenses/LICENSE,sha256=5OJuZ4wMMEV0DgF0tofhAlS_KLkaUsZwwwDS2U_GwQ0,1063
+divi-0.0.1.dev21.dist-info/RECORD,,