payi 0.1.0a36__py3-none-any.whl → 0.1.0a37__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.36"  # x-release-please-version
+__version__ = "0.1.0-alpha.37"  # x-release-please-version

payi/lib/instrument.py

@@ -216,13 +216,13 @@ class PayiInstrumentor:
             # should not happen
             return wrapped(*args, **kwargs)
 
-        if context.get("proxy", True):
-            proxy_extra_headers = kwargs.get("extra_headers", {})
-
-            self._update_headers(context, proxy_extra_headers)
+        # after _udpate_headers, all metadata to add to ingest is in extra_headers, keyed by the xproxy-xxx header name
+        extra_headers = kwargs.get("extra_headers", {})
+        self._update_headers(context, extra_headers)
 
+        if context.get("proxy", True):
             if "extra_headers" not in kwargs:
-                kwargs["extra_headers"] = proxy_extra_headers
+                kwargs["extra_headers"] = extra_headers
 
             return wrapped(*args, **kwargs)
 
@@ -242,16 +242,16 @@ class PayiInstrumentor:
         stream = kwargs.get("stream", False)
 
         try:
-            limit_ids = context.get("limit_ids")
-            request_tags = context.get("request_tags")
-            experience_name = context.get("experience_name")
-            experience_id = context.get("experience_id")
-            user_id = context.get("user_id")
+            limit_ids = extra_headers.pop("xProxy-Limit-IDs", None)
+            request_tags = extra_headers.pop("xProxy-Request-Tags", None)
+            experience_name = extra_headers.pop("xProxy-Experience-Name", None)
+            experience_id = extra_headers.pop("xProxy-Experience-ID", None)
+            user_id = extra_headers.pop("xProxy-User-ID", None)
 
             if limit_ids:
-                ingest["limit_ids"] = limit_ids
+                ingest["limit_ids"] = limit_ids.split(",")
             if request_tags:
-                ingest["request_tags"] = request_tags
+                ingest["request_tags"] = request_tags.split(",")
             if experience_name:
                 ingest["experience_name"] = experience_name
             if experience_id:
@@ -259,8 +259,6 @@ class PayiInstrumentor:
             if user_id:
                 ingest["user_id"] = user_id
 
-            extra_headers: dict[str, str] = kwargs.get("extra_headers") or {}
-
             if len(extra_headers) > 0:
                 ingest["provider_request_headers"] = {k: [v] for k, v in extra_headers.items()}  # type: ignore
 
@@ -321,30 +319,40 @@ class PayiInstrumentor:
         experience_id: Optional[str] = context.get("experience_id")
         user_id: Optional[str] = context.get("user_id")
 
+        # Merge limits from the decorator and extra headers
         if limit_ids is not None:
-            existing_limit_ids = extra_headers.get("xProxy-Limit-IDs")
-            limit_ids_str = ",".join(limit_ids)
-            if existing_limit_ids is None:
-                extra_headers["xProxy-Limit-IDs"] = limit_ids_str
+            existing_limit_ids = extra_headers.get("xProxy-Limit-IDs", None)
+            
+            if not existing_limit_ids:
+                extra_headers["xProxy-Limit-IDs"] = ",".join(limit_ids)
             else:
-                extra_headers["xProxy-Limit-IDs"] = f"{existing_limit_ids},{limit_ids_str}"
+                existing_ids = existing_limit_ids.split(',')
+                combined_ids = list(set(existing_ids + limit_ids))
+                extra_headers["xProxy-Limit-IDs"] = ",".join(combined_ids)
 
+        # Merge request from the decorator and extra headers
         if request_tags is not None:
-            existing_request_tags = extra_headers.get("xProxy-Request-Tags")
-            request_tags_str = ",".join(request_tags)
-            if existing_request_tags is None:
-                extra_headers["xProxy-Request-Tags"] = request_tags_str
-            else:
-                extra_headers["xProxy-Request-Tags"] = f"{existing_request_tags},{request_tags_str}"
-
-        if experience_name is not None:
-            extra_headers["xProxy-Experience-Name"] = experience_name
+            existing_request_tags = extra_headers.get("xProxy-Request-Tags", None)
 
-        if experience_id is not None:
-            extra_headers["xProxy-Experience-ID"] = experience_id
-
-        if user_id is not None:
-            extra_headers["xProxy-User-ID"] = user_id
+            if not existing_request_tags:
+                extra_headers["xProxy-Request-Tags"] = ",".join(request_tags)
+            else:
+                existing_tags = existing_request_tags.split(',')
+                combined_tags = list(set(existing_tags + request_tags))
+                extra_headers["xProxy-Request-Tags"] = ",".join(combined_tags)
+
+        # inner extra_headers user_id takes precedence over outer decorator user_id
+        if user_id is not None and extra_headers.get("xProxy-User-ID", None) is None:
+            extra_headers["xProxy-User-ID"] = user_id   
+
+        # inner extra_headers experience_name and experience_id take precedence over outer decorator experience_name and experience_id
+        # if either inner value is specified, ignore outer decorator values
+        if extra_headers.get("xProxy-Experience-Name", None) is None and extra_headers.get("xProxy-Experience-ID", None) is None:
+            if experience_name is not None:
+                extra_headers["xProxy-Experience-Name"] = experience_name
+
+            if experience_id is not None:
+                extra_headers["xProxy-Experience-ID"] = experience_id
 
     @staticmethod
     def payi_wrapper(func: Any) -> Any:

payi/resources/ingest.py

@@ -26,6 +26,7 @@ from .._base_client import make_request_options
 from ..types.ingest_response import IngestResponse
 from ..types.ingest_event_param import IngestEventParam
 from ..types.bulk_ingest_response import BulkIngestResponse
+from ..types.pay_i_common_models_api_router_header_info_param import PayICommonModelsAPIRouterHeaderInfoParam
 
 __all__ = ["IngestResource", "AsyncIngestResource"]
 
@@ -96,10 +97,9 @@ class IngestResource(SyncAPIResource):
         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[ingest_units_params.ProviderRequestHeader]] | NotGiven = NOT_GIVEN,
+        provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
         provider_request_json: Optional[str] | NotGiven = NOT_GIVEN,
-        provider_response_headers: Optional[Iterable[ingest_units_params.ProviderResponseHeader]]
-        | NotGiven = NOT_GIVEN,
+        provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
         provider_response_json: Union[str, List[str], None] | NotGiven = NOT_GIVEN,
         provider_uri: Optional[str] | NotGiven = NOT_GIVEN,
         time_to_first_token_ms: Optional[int] | NotGiven = NOT_GIVEN,
@@ -282,10 +282,9 @@ class AsyncIngestResource(AsyncAPIResource):
         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[ingest_units_params.ProviderRequestHeader]] | NotGiven = NOT_GIVEN,
+        provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
         provider_request_json: Optional[str] | NotGiven = NOT_GIVEN,
-        provider_response_headers: Optional[Iterable[ingest_units_params.ProviderResponseHeader]]
-        | NotGiven = NOT_GIVEN,
+        provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]] | NotGiven = NOT_GIVEN,
         provider_response_json: Union[str, List[str], None] | NotGiven = NOT_GIVEN,
         provider_uri: Optional[str] | NotGiven = NOT_GIVEN,
         time_to_first_token_ms: Optional[int] | NotGiven = NOT_GIVEN,

payi/types/__init__.py

@@ -35,3 +35,6 @@ from .price_modifier_update_params import PriceModifierUpdateParams as PriceModi
 from .category_list_resources_response import CategoryListResourcesResponse as CategoryListResourcesResponse
 from .price_modifier_retrieve_response import PriceModifierRetrieveResponse as PriceModifierRetrieveResponse
 from .category_delete_resource_response import CategoryDeleteResourceResponse as CategoryDeleteResourceResponse
+from .pay_i_common_models_api_router_header_info_param import (
+    PayICommonModelsAPIRouterHeaderInfoParam as PayICommonModelsAPIRouterHeaderInfoParam,
+)

payi/types/ingest_event_param.py

@@ -7,8 +7,9 @@ from datetime import datetime
 from typing_extensions import Required, Annotated, TypedDict
 
 from .._utils import PropertyInfo
+from .pay_i_common_models_api_router_header_info_param import PayICommonModelsAPIRouterHeaderInfoParam
 
-__all__ = ["IngestEventParam", "Units", "ProviderRequestHeader", "ProviderResponseHeader"]
+__all__ = ["IngestEventParam", "Units"]
 
 
 class Units(TypedDict, total=False):
@@ -17,18 +18,6 @@ class Units(TypedDict, total=False):
     output: int
 
 
-class ProviderRequestHeader(TypedDict, total=False):
-    name: Required[str]
-
-    value: Optional[str]
-
-
-class ProviderResponseHeader(TypedDict, total=False):
-    name: Required[str]
-
-    value: Optional[str]
-
-
 class IngestEventParam(TypedDict, total=False):
     category: Required[str]
 
@@ -54,11 +43,11 @@ class IngestEventParam(TypedDict, total=False):
 
     properties: Optional[Dict[str, str]]
 
-    provider_request_headers: Optional[Iterable[ProviderRequestHeader]]
+    provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]]
 
     provider_request_json: Optional[str]
 
-    provider_response_headers: Optional[Iterable[ProviderResponseHeader]]
+    provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]]
 
     provider_response_json: Union[str, List[str], None]
 

payi/types/ingest_units_params.py

@@ -7,8 +7,9 @@ from datetime import datetime
 from typing_extensions import Required, Annotated, TypedDict
 
 from .._utils import PropertyInfo
+from .pay_i_common_models_api_router_header_info_param import PayICommonModelsAPIRouterHeaderInfoParam
 
-__all__ = ["IngestUnitsParams", "Units", "ProviderRequestHeader", "ProviderResponseHeader"]
+__all__ = ["IngestUnitsParams", "Units"]
 
 
 class IngestUnitsParams(TypedDict, total=False):
@@ -28,11 +29,11 @@ class IngestUnitsParams(TypedDict, total=False):
 
     properties: Optional[Dict[str, str]]
 
-    provider_request_headers: Optional[Iterable[ProviderRequestHeader]]
+    provider_request_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]]
 
     provider_request_json: Optional[str]
 
-    provider_response_headers: Optional[Iterable[ProviderResponseHeader]]
+    provider_response_headers: Optional[Iterable[PayICommonModelsAPIRouterHeaderInfoParam]]
 
     provider_response_json: Union[str, List[str], None]
 
@@ -55,15 +56,3 @@ class Units(TypedDict, total=False):
     input: int
 
     output: int
-
-
-class ProviderRequestHeader(TypedDict, total=False):
-    name: Required[str]
-
-    value: Optional[str]
-
-
-class ProviderResponseHeader(TypedDict, total=False):
-    name: Required[str]
-
-    value: Optional[str]

payi/types/pay_i_common_models_api_router_header_info_param.py

@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PayICommonModelsAPIRouterHeaderInfoParam"]
+
+
+class PayICommonModelsAPIRouterHeaderInfoParam(TypedDict, total=False):
+    name: Required[str]
+
+    value: Optional[str]

{payi-0.1.0a36.dist-info → payi-0.1.0a37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: payi
-Version: 0.1.0a36
+Version: 0.1.0a37
 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.0a36.dist-info → payi-0.1.0a37.dist-info}/RECORD

@@ -11,7 +11,7 @@ payi/_resource.py,sha256=j2jIkTr8OIC8sU6-05nxSaCyj4MaFlbZrwlyg4_xJos,1088
 payi/_response.py,sha256=CfrNS_3wbL8o9dRyRVfZQ5E1GUlA4CUIUEK8olmfGqE,28777
 payi/_streaming.py,sha256=Z_wIyo206T6Jqh2rolFg2VXZgX24PahLmpURp0-NssU,10092
 payi/_types.py,sha256=2mbMK86K3W1aMTW7sOGQ-VND6-A2IuXKm8p4sYFztBU,6141
-payi/_version.py,sha256=WXEUS3siq-XLGD6ggHrJ2yahxSKu9QmeQ9tSwTyAGos,165
+payi/_version.py,sha256=A67yjD8NLx9gXE9bL3Mfhrk1I_WHFEwI9UTylp6UwFw,165
 payi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payi/_utils/__init__.py,sha256=PNZ_QJuzZEgyYXqkO1HVhGkj5IU9bglVUcw7H-Knjzw,2062
 payi/_utils/_logs.py,sha256=fmnf5D9TOgkgZKfgYmSa3PiUc3SZgkchn6CzJUeo0SQ,768
@@ -28,10 +28,10 @@ payi/lib/Instruments.py,sha256=cyL2jxjpRluP9rN8Vn1nmVXq2NNLdZuFIsHMQWWqat4,115
 payi/lib/OpenAIInstrumentor.py,sha256=eABTqxFLP109fOto33rBbXLh0FdQPh0a9VoMG4d6zGo,2575
 payi/lib/Stopwatch.py,sha256=vFyGVRvkppamP7W0IuZyypKLMIaqjhB7fcRG0dNyfnQ,757
 payi/lib/helpers.py,sha256=ZgkY8UE2YRc7ok2Pmxg_T9UMqKI8D8542JY3CP8RZCM,1597
-payi/lib/instrument.py,sha256=Mm1_RzVw0qZKeYrVzYo_3gj6MLITDv-IQl51OFDob3g,18645
+payi/lib/instrument.py,sha256=Ds49BFxqWnUMezL1tRr1IPBbb8rejDrjyi6t4YO9rCU,19549
 payi/resources/__init__.py,sha256=isHGXSl9kOrZDduKrX3UenTwrdTpuKJVBjw6NYSBV20,3592
 payi/resources/billing_models.py,sha256=5w3RfGXtGlyq5vbTw6hQrx1UlzRBtlq8ArcFlf5e3TY,20152
-payi/resources/ingest.py,sha256=F2R-m2dE0wGMHYJwUhD3HvRBqnZK82ZeDf6nPmqWKTU,18479
+payi/resources/ingest.py,sha256=JPtO7foPsftAgG92kSgU29_yOJSYuvIQtQB8WpRZuoQ,18567
 payi/resources/price_modifiers.py,sha256=t-k2F_zf2FhoxiqDHAPBPvhSgTjewlJqh50y58FNMuw,13475
 payi/resources/categories/__init__.py,sha256=w5gMiPdBSzJA_qfoVtFBElaoe8wGf_O63R7R1Spr6Gk,1093
 payi/resources/categories/categories.py,sha256=FohmajDcadMXzhG3Z1HKGkbSImO7rhzQ0olZXHz8z48,16074
@@ -46,7 +46,7 @@ payi/resources/limits/tags.py,sha256=s_3sIUOLZ-z67ZKRGzcFia6kBxI6POXTneP8hzNZ78o
 payi/resources/requests/__init__.py,sha256=sWDD18RLuwPB2yzxA29HiwhFdmjZAxzy1qK_4abAZ9E,1080
 payi/resources/requests/properties.py,sha256=ZsUeTMKQB4PNXn-jeoRwG-fqwpXzkRQyrFB8GmaNiQg,6466
 payi/resources/requests/requests.py,sha256=c-kt-qnrD17FvSrxBGoSBFbQDBEYDuJrf23-rPGzN1k,3763
-payi/types/__init__.py,sha256=8qVzwUIYOJjsf9Ugl7no3vWuDYTOZx7qL7XU7TwuSkM,2640
+payi/types/__init__.py,sha256=YPxEXBR-SY7g78u8cKi5cohvuRUlMmUfsY3hS-baOvo,2796
 payi/types/billing_model.py,sha256=zwpKldc0WvS3iGKtDb9KvfxCd3lkv8F4TwFy3ciGMXg,639
 payi/types/billing_model_create_params.py,sha256=iVvmCcw0VxXGI_0YolknD3gmDH2lXVydU1dg2IY4dC4,547
 payi/types/billing_model_list_response.py,sha256=hOFjJPQAKiWEArZeZwd8e1lDi5e41zbN6NvV_1rzJeM,290
@@ -63,9 +63,9 @@ payi/types/cost_details.py,sha256=w9p79opEG3kcsjkRRP7niaMcUswdfB4Y7HCkVTcQ1zQ,30
 payi/types/default_response.py,sha256=o617LpRsCIZHCZxAc5nVI2JQ3HPGZo4gCDvSDkxkIJ8,270
 payi/types/experience_instance_response.py,sha256=YVWjFpCMAFXsXbU5tgMKrvXHC2F5MsTWdltzRiCUIQA,309
 payi/types/ingest_bulk_params.py,sha256=d76YwiXaNeltLS3w86ZxLzTKGa7ymGLJDSelaMQGf8Y,382
-payi/types/ingest_event_param.py,sha256=0bmn4SJuEFyPDomjCJg4rqvW3Q1j_3GWQUV2ppjnSuc,1620
+payi/types/ingest_event_param.py,sha256=wA9YuiQceNL3veHO_rVuKZg9o-EB1WLoz0aaF6Wcm-k,1498
 payi/types/ingest_response.py,sha256=14VWaX91XuVZth1JBHY1djw8nF-0o6EK4N_WPq_p-Wc,1193
-payi/types/ingest_units_params.py,sha256=icx1GeG8wNfQlH5OdbrHQ15yocTGQD6s0JwkMXcrLQU,1871
+payi/types/ingest_units_params.py,sha256=0s_j6268ZmeXDw9lQ_HKLldA_EvNyPcOxM6kFxLwxkA,1749
 payi/types/limit_create_params.py,sha256=SbNoXHwy24kTTOxDhtcewtKxEkmXtTLYh4CTGysojys,578
 payi/types/limit_history_response.py,sha256=sCx2qKBiHU9X2KrYWV8NZiarYMGurof5GF4QobR2-EU,787
 payi/types/limit_list_params.py,sha256=iWM67oL53y2IZ7D3Gyy8mdYv-B7vF-rbmRFn7SBUnJk,364
@@ -73,6 +73,7 @@ payi/types/limit_reset_params.py,sha256=vgqImSM89pRYY0Z2RNrJuQ6WeDX72ZPg3GWpL9EV
 payi/types/limit_response.py,sha256=wYNsbsm5oMtF7W1sTbxlZ5VE0XaS_UbP6y7ZXGKfwqk,752
 payi/types/limit_update_params.py,sha256=crY4w75FWcEXbzysq1rPfD37qR5PTy_dwVRY4C_-T1w,331
 payi/types/paged_limit_list.py,sha256=tUMj5FsxXHGfBubxxltwahwiTl4TaCiVHpv4zmrTb4Q,1314
+payi/types/pay_i_common_models_api_router_header_info_param.py,sha256=91djoPLmoaMWTQOXv9-Ox24dWIrM2hudrRQTCqZpX4c,381
 payi/types/price_modifier.py,sha256=Sw_5tzCGnpjQzR5aZ70_ATpfBRQA_0ue2NRM3yMcvj0,531
 payi/types/price_modifier_create_params.py,sha256=RpcYr2JYFu-pxzY4Dx1ESMp9-FBHfKt03Iw-3tlZvXQ,404
 payi/types/price_modifier_retrieve_response.py,sha256=oFXWr38-O7KHItQlSsr7K8-Arpjq0yKexSUnbWqu62Q,303
@@ -104,7 +105,7 @@ payi/types/requests/__init__.py,sha256=K4qfrWMIIg1-UNB0Vu5UdGEmf6TWoF-i3gPc_LT78
 payi/types/requests/property_create_params.py,sha256=6v1L_4pj5N5k386cbtjSAWr2QJw---WUJ5lyshRnMwc,328
 payi/types/shared/__init__.py,sha256=zgBdtU5-a1ee8l5ABWyzuELwWRTKOCCcOx7gbCgdE4A,161
 payi/types/shared/evaluation_response.py,sha256=ejEToMA57PUu1SldEtJ5z9r4fAO3U0tvdjbsyIoVX1s,214
-payi-0.1.0a36.dist-info/METADATA,sha256=nKLBtCqXxjNSWv1jgbXfj9AWaCWGXe3y8HslbJnzdMc,12594
-payi-0.1.0a36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-payi-0.1.0a36.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
-payi-0.1.0a36.dist-info/RECORD,,
+payi-0.1.0a37.dist-info/METADATA,sha256=2rDEUus361E_chlt4fOLNwxdCYj4f3-U5jsr2R4wXvI,12594
+payi-0.1.0a37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+payi-0.1.0a37.dist-info/licenses/LICENSE,sha256=CQt03aM-P4a3Yg5qBg3JSLVoQS3smMyvx7tYg_6V7Gk,11334
+payi-0.1.0a37.dist-info/RECORD,,