payi 0.1.0a36__tar.gz → 0.1.0a37__tar.gz

payi-0.1.0a37/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.1.0-alpha.37"
+}

{payi-0.1.0a36 → payi-0.1.0a37}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.0-alpha.37 (2025-01-30)
+
+Full Changelog: [v0.1.0-alpha.36...v0.1.0-alpha.37](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.36...v0.1.0-alpha.37)
+
+### Features
+
+* **api:** manual updates ([#187](https://github.com/Pay-i/pay-i-python/issues/187)) ([028e7c8](https://github.com/Pay-i/pay-i-python/commit/028e7c86f30727a2883d9823cdedb450f8397d1c))
+
 ## 0.1.0-alpha.36 (2025-01-28)
 
 Full Changelog: [v0.1.0-alpha.35...v0.1.0-alpha.36](https://github.com/Pay-i/pay-i-python/compare/v0.1.0-alpha.35...v0.1.0-alpha.36)

{payi-0.1.0a36 → payi-0.1.0a37}/PKG-INFO

@@ -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 → payi-0.1.0a37}/api.md

@@ -52,7 +52,13 @@ Methods:
 Types:
 
 ```python
-from payi.types import BulkIngestResponse, IngestEvent, IngestResponse, IngestUnits
+from payi.types import (
+    BulkIngestResponse,
+    IngestEvent,
+    IngestResponse,
+    IngestUnits,
+    PayICommonModelsAPIRouterHeaderInfo,
+)
 ```
 
 Methods:

{payi-0.1.0a36 → payi-0.1.0a37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payi"
-version = "0.1.0-alpha.36"
+version = "0.1.0-alpha.37"
 description = "The official Python library for the payi API"
 dynamic = ["readme"]
 license = "Apache-2.0"

{payi-0.1.0a36 → payi-0.1.0a37}/src/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-0.1.0a36 → payi-0.1.0a37}/src/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-0.1.0a36 → payi-0.1.0a37}/src/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-0.1.0a36 → payi-0.1.0a37}/src/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-0.1.0a36 → payi-0.1.0a37}/src/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-0.1.0a36 → payi-0.1.0a37}/src/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-0.1.0a37/src/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/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.1.0-alpha.36"
-}