payi 0.1.0a99__py3-none-any.whl → 0.1.0a100__py3-none-any.whl

payi/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "payi"
-__version__ = "0.1.0-alpha.99"  # x-release-please-version
+__version__ = "0.1.0-alpha.100"  # x-release-please-version

payi/lib/instrument.py

@@ -112,11 +112,16 @@ class _ProviderRequest:
                 except Exception as _ex:
                     pass
  
-        properties: 'dict[str,str]' = { "system.failure": exception_str }
+        existing_properties = self._ingest.get("properties", None)
+        if not existing_properties:
+            existing_properties = {}
+
+        existing_properties['system.failure'] = exception_str
         if fields:
             failure_description = ",".join(fields)
-            properties["system.failure.description"] = failure_description[:128]
-        self._ingest["properties"] = properties
+            existing_properties["system.failure.description"] = failure_description[:128]
+
+        self._ingest["properties"] = existing_properties
 
         if "http_status_code" not in self._ingest:
             # use a non existent http status code so when presented to the user, the origin is clear
@@ -150,17 +155,21 @@ class PayiInstrumentConfig(TypedDict, total=False):
     use_case_name: Optional[str]
     use_case_id: Optional[str]
     use_case_version: Optional[int]
+    use_case_properties: Optional["dict[str, str]"]
     user_id: Optional[str]
     request_tags: Optional["list[str]"]
+    request_properties: Optional["dict[str, str]"]
 
 class PayiContext(TypedDict, total=False):
     use_case_name: Optional[str]
     use_case_id: Optional[str]
     use_case_version: Optional[int]
     use_case_step: Optional[str]
+    use_case_properties: Optional["dict[str, str]"]
     limit_ids: Optional['list[str]']
     user_id: Optional[str]
     request_tags: Optional["list[str]"]
+    request_properties: Optional["dict[str, str]"]
     price_as_category: Optional[str]
     price_as_resource: Optional[str]
     resource_scope: Optional[str]
@@ -172,9 +181,11 @@ class _Context(TypedDict, total=False):
     use_case_id: Optional[str]
     use_case_version: Optional[int]
     use_case_step: Optional[str]
+    use_case_properties: Optional["dict[str, str]"]
     limit_ids: Optional['list[str]']
     user_id: Optional[str]
     request_tags: Optional["list[str]"]
+    request_properties: Optional["dict[str, str]"]
     price_as_category: Optional[str]
     price_as_resource: Optional[str]
     resource_scope: Optional[str]
@@ -645,6 +656,8 @@ class _PayiInstrumentor:
         use_case_step: Optional[str]= None,
         user_id: Optional[str]= None,
         request_tags: Optional["list[str]"] = None,
+        request_properties: Optional["dict[str, str]"] = None,
+        use_case_properties: Optional["dict[str, str]"] = None,
         price_as_category: Optional[str] = None,
         price_as_resource: Optional[str] = None,
         resource_scope: Optional[str] = None,
@@ -719,6 +732,38 @@ class _PayiInstrumentor:
             # use the parent request_tags if it exists
             context["request_tags"] = parent_request_tags
 
+        parent_request_properties = parent_context.get("request_properties", None)
+        if request_properties is not None:
+            if not request_properties:
+                context["request_properties"] = None
+            else:
+                if parent_request_properties:
+                    # merge dictionaries, child overrides parent keys
+                    merged = parent_request_properties.copy()
+                    merged.update(request_properties)
+                    context["request_properties"] = merged
+                else:
+                    context["request_properties"] = request_properties
+        elif parent_request_properties:
+            # use the parent request_properties if it exists
+            context["request_properties"] = parent_request_properties
+
+        parent_use_case_properties = parent_context.get("use_case_properties", None)
+        if use_case_properties is not None:
+            if not use_case_properties:
+                context["use_case_properties"] = None
+            else:
+                if parent_use_case_properties:
+                    # merge dictionaries, child overrides parent keys
+                    merged = parent_use_case_properties.copy()
+                    merged.update(use_case_properties)
+                    context["use_case_properties"] = merged
+                else:
+                    context["use_case_properties"] = use_case_properties
+        elif parent_use_case_properties:
+            # use the parent use_case_properties if it exists
+            context["use_case_properties"] = parent_use_case_properties
+
         if use_case_step and (context["use_case_name"] or context["use_case_id"]):
             context["use_case_step"] = use_case_step
         if price_as_category:
@@ -738,6 +783,8 @@ class _PayiInstrumentor:
         use_case_version: Optional[int],        
         user_id: Optional[str],
         request_tags: Optional["list[str]"] = None,
+        request_properties: Optional["dict[str, str]"] = None,
+        use_case_properties: Optional["dict[str, str]"] = None,
         *args: Any,
         **kwargs: Any,
     ) -> Any:
@@ -749,7 +796,10 @@ class _PayiInstrumentor:
                 use_case_id=use_case_id,
                 use_case_version=use_case_version,
                 user_id=user_id,
-                request_tags=request_tags)
+                request_tags=request_tags,
+                request_properties=request_properties,
+                use_case_properties=use_case_properties
+            )
             return await func(*args, **kwargs)
 
     def _call_func(
@@ -762,6 +812,8 @@ class _PayiInstrumentor:
         use_case_version: Optional[int],        
         user_id: Optional[str],
         request_tags: Optional["list[str]"] = None,
+        request_properties: Optional["dict[str, str]"] = None,
+        use_case_properties: Optional["dict[str, str]"] = None,
         *args: Any,
         **kwargs: Any,
     ) -> Any:
@@ -773,7 +825,9 @@ class _PayiInstrumentor:
                 use_case_id=use_case_id,
                 use_case_version=use_case_version,
                 user_id=user_id,
-                request_tags=request_tags)
+                request_tags=request_tags,
+                request_properties=request_properties,
+                use_case_properties=use_case_properties)
             return func(*args, **kwargs)
 
     def __enter__(self) -> Any:
@@ -797,7 +851,8 @@ class _PayiInstrumentor:
     def _prepare_ingest(
         self,
         request: _ProviderRequest,
-        ingest_extra_headers: "dict[str, str]", # do not coflict potential kwargs["extra_headers"]
+        context: _Context,
+        ingest_extra_headers: "dict[str, str]", # do not conflict with potential kwargs["extra_headers"]
         args: Sequence[Any],
         kwargs: 'dict[str, Any]',
     ) -> None:
@@ -827,6 +882,14 @@ class _PayiInstrumentor:
         if user_id:
             request._ingest["user_id"] = user_id
 
+        request_properties = context.get("request_properties", None)
+        if request_properties:
+            request._ingest["properties"] = request_properties
+
+        use_case_properties = context.get("use_case_properties", None)
+        if use_case_properties:
+            request._ingest["use_case_properties"] = use_case_properties
+
         if len(ingest_extra_headers) > 0:
             request._ingest["provider_request_headers"] = [PayICommonModelsAPIRouterHeaderInfoParam(name=k, value=v) for k, v in ingest_extra_headers.items()]
 
@@ -909,7 +972,7 @@ class _PayiInstrumentor:
             stream = False
 
         try:
-            self._prepare_ingest(request, extra_headers, args, kwargs)
+            self._prepare_ingest(request, context, extra_headers, args, kwargs)
             self._logger.debug(f"async_invoke_wrapper: calling wrapped instance (stream={stream})")
 
             sw.start()
@@ -1032,7 +1095,7 @@ class _PayiInstrumentor:
             stream = False
 
         try:
-            self._prepare_ingest(request, extra_headers, args, kwargs)
+            self._prepare_ingest(request, context, extra_headers, args, kwargs)
             self._logger.debug(f"invoke_wrapper: calling wrapped instance (stream={stream})")
 
             sw.start()
@@ -1586,6 +1649,7 @@ global _instrumentor
 _instrumentor: Optional[_PayiInstrumentor] = None
 
 def payi_instrument(
+    *,
     payi: Optional[Union[Payi, AsyncPayi, 'list[Union[Payi, AsyncPayi]]']] = None,
     instruments: Optional[Set[str]] = None,
     log_prompt_and_response: bool = True,
@@ -1628,12 +1692,15 @@ def payi_instrument(
     )
 
 def track(
+    *,
     limit_ids: Optional["list[str]"] = None,
     use_case_name: Optional[str] = None,
     use_case_id: Optional[str] = None,
     use_case_version: Optional[int] = None,
     user_id: Optional[str] = None,
     request_tags: Optional["list[str]"] = None,
+    request_properties: Optional["dict[str, str]"] = None,
+    use_case_properties: Optional["dict[str, str]"] = None,
     proxy: Optional[bool] = None,
 ) -> Any:
 
@@ -1656,6 +1723,8 @@ def track(
                     use_case_version,
                     user_id,
                     request_tags,
+                    request_properties,
+                    use_case_properties,
                     *args,
                     **kwargs,
                 )
@@ -1677,6 +1746,8 @@ def track(
                     use_case_version,
                     user_id,
                     request_tags,
+                    request_properties,
+                    use_case_properties,
                     *args,
                     **kwargs,
                 )
@@ -1684,6 +1755,7 @@ def track(
     return _track
 
 def track_context(
+    *,
     limit_ids: Optional["list[str]"] = None,
     use_case_name: Optional[str] = None,
     use_case_id: Optional[str] = None,
@@ -1691,6 +1763,8 @@ def track_context(
     use_case_step: Optional[str] = None,
     user_id: Optional[str] = None,
     request_tags: Optional["list[str]"] = None,
+    request_properties: Optional["dict[str, str]"] = None,
+    use_case_properties: Optional["dict[str, str]"] = None,
     price_as_category: Optional[str] = None,
     price_as_resource: Optional[str] = None,
     resource_scope: Optional[str] = None,
@@ -1715,6 +1789,9 @@ def track_context(
     context["price_as_resource"] = price_as_resource
     context["resource_scope"] = resource_scope
 
+    context["request_properties"] = request_properties
+    context["use_case_properties"] = use_case_properties
+
     return _InternalTrackContext(context)
 
 def get_context() -> PayiContext:

payi/resources/ingest.py

@@ -90,7 +90,6 @@ class IngestResource(SyncAPIResource):
         units: Dict[str, IngestUnits],
         end_to_end_latency_ms: Optional[int] | NotGiven = NOT_GIVEN,
         event_timestamp: Union[str, datetime, None] | NotGiven = NOT_GIVEN,
-        experience_properties: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
         http_status_code: Optional[int] | NotGiven = NOT_GIVEN,
         properties: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
         provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
@@ -133,11 +132,13 @@ class IngestResource(SyncAPIResource):
 
           output (int): The number of output units
 
-          event_timestamp: (str, datetime, None): The timestamp of the event. Defaults to None.
+          event_timestamp: (str, datetime, None): The timestamp of the event
 
-          limit_ids (list[str], optional): The limit IDs to associate with the request. Defaults to None.
+          limit_ids (list[str], optional): The limit IDs to associate with the request
 
-          request_tags (list[str], optional): The request tags to associate with the request. Defaults to None.
+          properties (Dict[str, str], optional): Properties to associate with the request
+
+          request_tags (list[str], optional): The request tags to associate with the request
 
           use_case_name (str, optional): The use case name
 
@@ -147,6 +148,8 @@ class IngestResource(SyncAPIResource):
 
           use_case_version (int, optional): The use case instance version
 
+          use_case_properties (Dict[str, str], optional): The use case properties
+
           user_id (str, optional): The user id
           
           resource_scope(str, optional): The scope of the resource
@@ -234,7 +237,6 @@ class IngestResource(SyncAPIResource):
                     "units": units,
                     "end_to_end_latency_ms": end_to_end_latency_ms,
                     "event_timestamp": event_timestamp,
-                    "experience_properties": experience_properties,
                     "http_status_code": http_status_code,
                     "properties": properties,
                     "provider_request_headers": provider_request_headers,
@@ -318,7 +320,6 @@ class AsyncIngestResource(AsyncAPIResource):
         units: Dict[str, IngestUnits],
         end_to_end_latency_ms: Optional[int] | NotGiven = NOT_GIVEN,
         event_timestamp: Union[str, datetime, None] | NotGiven = NOT_GIVEN,
-        experience_properties: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
         http_status_code: Optional[int] | NotGiven = NOT_GIVEN,
         properties: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
         provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
@@ -360,11 +361,13 @@ class AsyncIngestResource(AsyncAPIResource):
 
           output (int): The number of output units
 
-          event_timestamp: (datetime, None): The timestamp of the event. Defaults to None.
+          event_timestamp: (datetime, None): The timestamp of the event
 
-          limit_ids (list[str], optional): The limit IDs to associate with the request. Defaults to None.
+          limit_ids (list[str], optional): The limit IDs to associate with the request 
 
-          request_tags (list[str], optional): The request tags to associate with the request. Defaults to None.
+          properties (Dict[str, str], optional): Properties to associate with the request 
+
+          request_tags (list[str], optional): The request tags to associate with the request
 
           use_case_name (str, optional): The use case name
 
@@ -374,6 +377,8 @@ class AsyncIngestResource(AsyncAPIResource):
 
           use_case_version (int, optional): The use case instance version
 
+          use_case_properties (Dict[str, str], optional): The use case properties
+
           user_id (str, optional): The user id
           
           resource_scope (str, optional): The scope of the resource
@@ -460,7 +465,6 @@ class AsyncIngestResource(AsyncAPIResource):
                     "units": units,
                     "end_to_end_latency_ms": end_to_end_latency_ms,
                     "event_timestamp": event_timestamp,
-                    "experience_properties": experience_properties,
                     "http_status_code": http_status_code,
                     "properties": properties,
                     "provider_request_headers": provider_request_headers,

payi/types/ingest_units_params.py

@@ -24,8 +24,6 @@ class IngestUnitsParams(TypedDict, total=False):
 
     event_timestamp: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
 
-    experience_properties: Optional[Dict[str, str]]
-
     http_status_code: Optional[int]
 
     properties: Optional[Dict[str, str]]

{payi-0.1.0a99.dist-info → payi-0.1.0a100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: payi
-Version: 0.1.0a99
+Version: 0.1.0a100
 Summary: The official Python library for the payi API
 Project-URL: Homepage, https://github.com/Pay-i/pay-i-python
 Project-URL: Repository, https://github.com/Pay-i/pay-i-python

{payi-0.1.0a99.dist-info → payi-0.1.0a100.dist-info}/RECORD

@@ -11,7 +11,7 @@ payi/_resource.py,sha256=j2jIkTr8OIC8sU6-05nxSaCyj4MaFlbZrwlyg4_xJos,1088
 payi/_response.py,sha256=rh9oJAvCKcPwQFm4iqH_iVrmK8bNx--YP_A2a4kN1OU,28776
 payi/_streaming.py,sha256=Z_wIyo206T6Jqh2rolFg2VXZgX24PahLmpURp0-NssU,10092
 payi/_types.py,sha256=7jE5MoQQFVoVxw5vVzvZ2Ao0kcjfNOGsBgyJfLBEnMo,6195
-payi/_version.py,sha256=lz4fBrZ99BQNkc5pT-roGUpti7Awbw0lAMScpAiTtHQ,165
+payi/_version.py,sha256=aP6D6A3iD2QBDh8sdA6JgNJrQV-FEHsxHI15LuG2nIs,166
 payi/pagination.py,sha256=k2356QGPOUSjRF2vHpwLBdF6P-2vnQzFfRIJQAHGQ7A,1258
 payi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payi/_utils/__init__.py,sha256=PNZ_QJuzZEgyYXqkO1HVhGkj5IU9bglVUcw7H-Knjzw,2062
@@ -33,10 +33,10 @@ payi/lib/Stopwatch.py,sha256=7OJlxvr2Jyb6Zr1LYCYKczRB7rDVKkIR7gc4YoleNdE,764
 payi/lib/VertexInstrumentor.py,sha256=OWuMPiW4LdLhj6DSAAy5qZiosVo8DSAuFWGxYpEucoE,7431
 payi/lib/VertexRequest.py,sha256=edv14HR5QtKaf07gmOqzWdhoJGdWCos85uCZASwsGL4,11710
 payi/lib/helpers.py,sha256=FPzNSSHGf9bgD6CanB7yVx_U8t4lm2c0jlZKrsziYlc,4242
-payi/lib/instrument.py,sha256=R3NSYXtoZX5nCvPtSWxREF_qlMkjkDQCF2RIxlO2E_s,69224
+payi/lib/instrument.py,sha256=TU3wZrG79YFt_WnIA8fsjQBPdWDHSqvm_pVT45AZ6XY,72824
 payi/lib/version_helper.py,sha256=v0lC3kuaXn6PBDolE3mkmwJiA8Ot3z4RkVR7wlBuZCs,540
 payi/resources/__init__.py,sha256=B2bn1ZfCf6TbHlzZvy5TpFPtALnFcBRPYVKQH3S5qfQ,2457
-payi/resources/ingest.py,sha256=awE7xDdKOUL2Yhcrhcc11hSNycBlj8QRlahptjana5Q,23040
+payi/resources/ingest.py,sha256=Ti7JkuHvdGSSyMiyI6PHBRlM1fKRkKdR5sQhs5t9v04,22980
 payi/resources/categories/__init__.py,sha256=WeotN_d-0Ri8ohsrNPbve7RyViD9_N0NA9DrV3WYg3w,1701
 payi/resources/categories/categories.py,sha256=yYCkCxaYPWees9I9cx9CPy_H9wZK2X7jq8tRh-G__v8,20653
 payi/resources/categories/fixed_cost_resources.py,sha256=tLJlZ06KDIOHpVF4iq8S9IPocGohbOYh9LO0cWGznUA,7824
@@ -71,7 +71,7 @@ payi/types/default_response.py,sha256=o617LpRsCIZHCZxAc5nVI2JQ3HPGZo4gCDvSDkxkIJ
 payi/types/ingest_bulk_params.py,sha256=A-IRb39d2tmVzEQqrvhlF_3si-9ufHBKYLlvdXupAHU,362
 payi/types/ingest_event_param.py,sha256=Nxf-sRKlks8gXaSM_52s_3TkvG0SJICxsvgkRch_Yxk,2054
 payi/types/ingest_response.py,sha256=JwcZ6OL793uXTuDmZAzkzhGcdtDsSXfSy_ERjzc7MZY,378
-payi/types/ingest_units_params.py,sha256=EoqA2CZ2_Ivh0q6IcpcVhnYAIIeBifP9GRdFcJYIR9k,2579
+payi/types/ingest_units_params.py,sha256=Zj0PcVPbjRAz3lwqJqJ2QS8FXxdRwCMlVD5frEshtbk,2526
 payi/types/limit_create_params.py,sha256=NHQHY1eeetGS6lU8aMIcibvVPzYE04mzLcf4Sz06gBs,578
 payi/types/limit_history_response.py,sha256=vJnVVa5BROfYHRPvpfymcOabjDhcJtFowQF-L-apNgw,770
 payi/types/limit_list_params.py,sha256=OYlK0anDA5G71FfwrMDzhEX4S5AlASLRiR0tmyD9tTU,322
@@ -133,7 +133,7 @@ payi/types/use_cases/definitions/kpi_retrieve_response.py,sha256=uQXliSvS3k-yDYw
 payi/types/use_cases/definitions/kpi_update_params.py,sha256=jbawdWAdMnsTWVH0qfQGb8W7_TXe3lq4zjSRu44d8p8,373
 payi/types/use_cases/definitions/kpi_update_response.py,sha256=zLyEoT0S8d7XHsnXZYT8tM7yDw0Aze0Mk-_Z6QeMtc8,459
 payi/types/use_cases/definitions/limit_config_create_params.py,sha256=pzQza_16N3z8cFNEKr6gPbFvuGFrwNuGxAYb--Kbo2M,449
-payi-0.1.0a99.dist-info/METADATA,sha256=bKNzn3yNMBUd6n_-CpTzrZ6ahCwh053d0-BoCkp8gqc,16289
-payi-0.1.0a99.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-payi-0.1.0a99.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a99.dist-info/RECORD,,
+payi-0.1.0a100.dist-info/METADATA,sha256=eBQFP4sVGO_T3gn7fzWy9UL8vLfFDSZz0c5LKdNFPOk,16290
+payi-0.1.0a100.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+payi-0.1.0a100.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a100.dist-info/RECORD,,