polyapi-python 0.3.14.dev1__tar.gz → 0.3.14.dev3__tar.gz

{polyapi_python-0.3.14.dev1/polyapi_python.egg-info → polyapi_python-0.3.14.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.14.dev1
+Version: 0.3.14.dev3
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -30,9 +30,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.32.3
 Requires-Dist: typing_extensions>=4.12.2
-Requires-Dist: jsonschema-gentypes==2.6.0
-Requires-Dist: pydantic>=2.8.0
-Requires-Dist: stdlib_list>=0.10.0
+Requires-Dist: jsonschema-gentypes==2.10.0
+Requires-Dist: pydantic<3.0.0,>=2.8.0
+Requires-Dist: stdlib_list<1.0.0,>=0.10.0
 Requires-Dist: colorama==0.4.4
 Requires-Dist: python-socketio[asyncio_client]==5.11.1
 Requires-Dist: truststore>=0.8.0

polyapi_python-0.3.14.dev3/polyapi/__init__.py

@@ -0,0 +1,163 @@
+import copy
+import os
+import sys
+from contextvars import ContextVar, Token
+from dataclasses import dataclass
+from typing import Any, Dict, Literal, Optional, overload
+
+import truststore
+from typing_extensions import TypedDict
+
+from .cli_constants import CLI_COMMANDS
+
+truststore.inject_into_ssl()
+
+__all__ = ["poly"]
+
+
+if len(sys.argv) > 1 and sys.argv[1] not in CLI_COMMANDS:
+    currdir = os.path.dirname(os.path.abspath(__file__))
+    if not os.path.isdir(os.path.join(currdir, "poly")):
+        print("No 'poly' found. Please run 'python3 -m polyapi generate' to generate the 'poly' library for your tenant.")
+        sys.exit(1)
+
+
+class PolyCustomDict(TypedDict, total=False):
+    """Type definition for polyCustom dictionary."""
+
+    executionId: Optional[str]  # Read-only unless explicitly unlocked
+    executionApiKey: Optional[str]
+    userSessionId: Optional[str]
+    responseStatusCode: Optional[int]
+    responseContentType: Optional[str]
+    responseHeaders: Dict[str, Any]
+
+
+@dataclass
+class _PolyCustomState:
+    internal_store: Dict[str, Any]
+    execution_id_locked: bool = False
+
+
+class PolyCustom:
+    def __init__(self) -> None:
+        object.__setattr__(
+            self,
+            "_default_store",
+            {
+                "executionId": None,
+                "executionApiKey": None,
+                "userSessionId": None,
+                "responseStatusCode": 200,
+                "responseContentType": None,
+                "responseHeaders": {},
+            },
+        )
+        object.__setattr__(self, "_state_var", ContextVar("_poly_custom_state", default=None))
+
+    def _make_state(self) -> _PolyCustomState:
+        return _PolyCustomState(internal_store=copy.deepcopy(self._default_store))
+
+    def _get_state(self) -> _PolyCustomState:
+        state = self._state_var.get()
+        if state is None:
+            state = self._make_state()
+            self._state_var.set(state)
+        return state
+
+    def push_scope(self, initial_values: Optional[Dict[str, Any]] = None) -> Token:
+        state = self._make_state()
+        if initial_values:
+            state.internal_store.update(copy.deepcopy(initial_values))
+            if state.internal_store.get("executionId") is not None:
+                state.execution_id_locked = True
+        return self._state_var.set(state)
+
+    def pop_scope(self, token: Token) -> None:
+        self._state_var.reset(token)
+
+    def set_once(self, key: str, value: Any) -> None:
+        state = self._get_state()
+        if key == "executionId" and state.execution_id_locked:
+            return
+        state.internal_store[key] = value
+        if key == "executionId":
+            state.execution_id_locked = True
+
+    def get(self, key: str, default: Any = None) -> Any:
+        return self._get_state().internal_store.get(key, default)
+
+    def lock_execution_id(self) -> None:
+        self._get_state().execution_id_locked = True
+
+    def unlock_execution_id(self) -> None:
+        self._get_state().execution_id_locked = False
+
+    @overload
+    def __getitem__(self, key: Literal["executionId"]) -> Optional[str]: ...
+
+    @overload
+    def __getitem__(self, key: Literal["executionApiKey"]) -> Optional[str]: ...
+
+    @overload
+    def __getitem__(self, key: Literal["userSessionId"]) -> Optional[str]: ...
+
+    @overload
+    def __getitem__(self, key: Literal["responseStatusCode"]) -> Optional[int]: ...
+
+    @overload
+    def __getitem__(self, key: Literal["responseContentType"]) -> Optional[str]: ...
+
+    @overload
+    def __getitem__(self, key: Literal["responseHeaders"]) -> Dict[str, Any]: ...
+
+    def __getitem__(self, key: str) -> Any:
+        return self.get(key)
+
+    @overload
+    def __setitem__(self, key: Literal["executionApiKey"], value: Optional[str]) -> None: ...
+
+    @overload
+    def __setitem__(self, key: Literal["userSessionId"], value: Optional[str]) -> None: ...
+
+    @overload
+    def __setitem__(self, key: Literal["responseStatusCode"], value: Optional[int]) -> None: ...
+
+    @overload
+    def __setitem__(self, key: Literal["responseContentType"], value: Optional[str]) -> None: ...
+
+    @overload
+    def __setitem__(self, key: Literal["responseHeaders"], value: Dict[str, Any]) -> None: ...
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.set_once(key, value)
+
+    def __getattr__(self, key: str) -> Any:
+        if key in self._default_store:
+            return self.get(key)
+        raise AttributeError(f"{type(self).__name__!r} object has no attribute {key!r}")
+
+    def __setattr__(self, key: str, value: Any) -> None:
+        if key.startswith("_"):
+            object.__setattr__(self, key, value)
+            return
+        self.set_once(key, value)
+
+    def __repr__(self) -> str:
+        return f"PolyCustom({self._get_state().internal_store})"
+
+    def copy(self) -> "PolyCustom":
+        new = PolyCustom()
+        state = self._get_state()
+        new._state_var.set(
+            _PolyCustomState(
+                internal_store=copy.deepcopy(state.internal_store),
+                execution_id_locked=state.execution_id_locked,
+            )
+        )
+        return new
+
+
+_PolyCustom = PolyCustom
+
+polyCustom: PolyCustom = PolyCustom()

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3}/polyapi/cli.py

@@ -3,6 +3,7 @@ import argparse
 
 from polyapi.utils import print_green, print_red
 
+from .cli_constants import CLI_COMMANDS
 from .config import initialize_config, set_api_key_and_url
 from .generate import generate, clear
 from .function_cli import function_add_or_update, function_execute
@@ -11,9 +12,6 @@ from .prepare import prepare_deployables
 from .sync import sync_deployables
 
 
-CLI_COMMANDS = ["setup", "generate", "function", "clear", "help", "update_rendered_spec"]
-
-
 def _get_version_string():
     """Get the version string for the package."""
     try:

polyapi_python-0.3.14.dev3/polyapi/cli_constants.py

@@ -0,0 +1,10 @@
+CLI_COMMANDS = (
+    "setup",
+    "generate",
+    "function",
+    "clear",
+    "help",
+    "update_rendered_spec",
+    "prepare",
+    "sync",
+)

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3}/polyapi/constants.py

@@ -3,8 +3,8 @@ JSONSCHEMA_TO_PYTHON_TYPE_MAP = {
     "number": "float",
     "string": "str",
     "boolean": "bool",
-    "array": "List",
-    "object": "Dict",
+    "array": "list",
+    "object": "dict",
     "function": "Callable",
     "void": "None",
 }
@@ -15,10 +15,13 @@ PYTHON_TO_JSONSCHEMA_TYPE_MAP = {
     "float": "number",
     "str": "string",
     "bool": "boolean",
-    "List": "array",
-    "Dict": "object",
+    "list": "array",
+    "dict": "object",
     "Callable": "function",
     "None": "void",
+    # Keep uppercase aliases for backwards compatibility
+    "List": "array",
+    "Dict": "object",
 }
 
 BASIC_PYTHON_TYPES = set(PYTHON_TO_JSONSCHEMA_TYPE_MAP.keys())

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.14.dev1
+Version: 0.3.14.dev3
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -30,9 +30,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.32.3
 Requires-Dist: typing_extensions>=4.12.2
-Requires-Dist: jsonschema-gentypes==2.6.0
-Requires-Dist: pydantic>=2.8.0
-Requires-Dist: stdlib_list>=0.10.0
+Requires-Dist: jsonschema-gentypes==2.10.0
+Requires-Dist: pydantic<3.0.0,>=2.8.0
+Requires-Dist: stdlib_list<1.0.0,>=0.10.0
 Requires-Dist: colorama==0.4.4
 Requires-Dist: python-socketio[asyncio_client]==5.11.1
 Requires-Dist: truststore>=0.8.0

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3}/polyapi_python.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ polyapi/__main__.py
 polyapi/api.py
 polyapi/auth.py
 polyapi/cli.py
+polyapi/cli_constants.py
 polyapi/client.py
 polyapi/config.py
 polyapi/constants.py
@@ -40,6 +41,7 @@ tests/test_auth.py
 tests/test_deployables.py
 tests/test_generate.py
 tests/test_parser.py
+tests/test_poly_custom.py
 tests/test_rendered_spec.py
 tests/test_schema.py
 tests/test_server.py

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3}/polyapi_python.egg-info/requires.txt

@@ -1,8 +1,8 @@
 requests>=2.32.3
 typing_extensions>=4.12.2
-jsonschema-gentypes==2.6.0
-pydantic>=2.8.0
-stdlib_list>=0.10.0
+jsonschema-gentypes==2.10.0
+pydantic<3.0.0,>=2.8.0
+stdlib_list<1.0.0,>=0.10.0
 colorama==0.4.4
 python-socketio[asyncio_client]==5.11.1
 truststore>=0.8.0

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3}/pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyapi-python"
-version = "0.3.14.dev1"
+version = "0.3.14.dev3"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [
     "requests>=2.32.3",
     "typing_extensions>=4.12.2",
-    "jsonschema-gentypes==2.6.0",
-    "pydantic>=2.8.0",
-    "stdlib_list>=0.10.0",
+    "jsonschema-gentypes==2.10.0",
+    "pydantic>=2.8.0,<3.0.0",
+    "stdlib_list>=0.10.0,<1.0.0",
     "colorama==0.4.4",
     "python-socketio[asyncio_client]==5.11.1",
     "truststore>=0.8.0",

polyapi_python-0.3.14.dev3/tests/test_poly_custom.py

@@ -0,0 +1,130 @@
+import asyncio
+import importlib
+import sys
+from concurrent.futures import ThreadPoolExecutor
+
+
+def _reload_polyapi():
+    sys.modules.pop("polyapi", None)
+    sys.modules.pop("polyapi.cli", None)
+    return importlib.import_module("polyapi")
+
+
+def test_import_polyapi_does_not_import_cli():
+    polyapi = _reload_polyapi()
+
+    assert polyapi is not None
+    assert "polyapi.cli" not in sys.modules
+
+
+def test_cli_constants_shared_between_runtime_and_cli():
+    cli_constants = importlib.import_module("polyapi.cli_constants")
+    cli_module = importlib.import_module("polyapi.cli")
+
+    assert tuple(cli_module.CLI_COMMANDS) == cli_constants.CLI_COMMANDS
+
+
+def test_poly_custom_nested_scopes_restore_previous_state():
+    polyapi = _reload_polyapi()
+    poly_custom = polyapi.polyCustom
+
+    outer_token = poly_custom.push_scope(
+        {
+            "executionId": "outer",
+            "responseHeaders": {"x-scope": "outer"},
+            "responseStatusCode": None,
+        }
+    )
+    try:
+        assert poly_custom["executionId"] == "outer"
+
+        inner_token = poly_custom.push_scope(
+            {
+                "executionId": "inner",
+                "responseHeaders": {"x-scope": "inner"},
+                "responseStatusCode": 202,
+            }
+        )
+        try:
+            assert poly_custom["executionId"] == "inner"
+            assert poly_custom["responseHeaders"] == {"x-scope": "inner"}
+            assert poly_custom.responseStatusCode == 202
+
+            poly_custom["executionId"] = "should-not-overwrite"
+            assert poly_custom["executionId"] == "inner"
+
+            poly_custom.unlock_execution_id()
+            poly_custom["executionId"] = "inner-updated"
+            assert poly_custom["executionId"] == "inner-updated"
+        finally:
+            poly_custom.pop_scope(inner_token)
+
+        assert poly_custom["executionId"] == "outer"
+        assert poly_custom["responseHeaders"] == {"x-scope": "outer"}
+        assert poly_custom["responseStatusCode"] is None
+    finally:
+        poly_custom.pop_scope(outer_token)
+
+    assert poly_custom["executionId"] is None
+    assert poly_custom["responseHeaders"] == {}
+    assert poly_custom["responseStatusCode"] == 200
+
+
+def test_poly_custom_isolated_across_async_tasks():
+    polyapi = _reload_polyapi()
+    poly_custom = polyapi.polyCustom
+
+    async def worker(execution_id: str) -> tuple[str, str]:
+        token = poly_custom.push_scope(
+            {
+                "executionId": execution_id,
+                "responseHeaders": {"worker": execution_id},
+                "responseStatusCode": None,
+            }
+        )
+        try:
+            await asyncio.sleep(0)
+            poly_custom["responseHeaders"]["seen"] = execution_id
+            await asyncio.sleep(0)
+            return poly_custom["executionId"], poly_custom["responseHeaders"]["seen"]
+        finally:
+            poly_custom.pop_scope(token)
+
+    async def run_workers() -> tuple[tuple[str, str], tuple[str, str]]:
+        first_result, second_result = await asyncio.gather(worker("async-a"), worker("async-b"))
+        return first_result, second_result
+
+    first, second = asyncio.run(run_workers())
+
+    assert first == ("async-a", "async-a")
+    assert second == ("async-b", "async-b")
+    assert poly_custom["executionId"] is None
+    assert poly_custom["responseHeaders"] == {}
+
+
+def test_poly_custom_isolated_across_threads():
+    polyapi = _reload_polyapi()
+    poly_custom = polyapi.polyCustom
+
+    def worker(execution_id: str) -> tuple[str, str]:
+        token = poly_custom.push_scope(
+            {
+                "executionId": execution_id,
+                "responseHeaders": {"worker": execution_id},
+                "responseStatusCode": None,
+            }
+        )
+        try:
+            poly_custom["responseHeaders"]["seen"] = execution_id
+            return poly_custom["executionId"], poly_custom["responseHeaders"]["seen"]
+        finally:
+            poly_custom.pop_scope(token)
+
+    with ThreadPoolExecutor(max_workers=2) as executor:
+        first = executor.submit(worker, "thread-a").result()
+        second = executor.submit(worker, "thread-b").result()
+
+    assert first == ("thread-a", "thread-a")
+    assert second == ("thread-b", "thread-b")
+    assert poly_custom["executionId"] is None
+    assert poly_custom["responseHeaders"] == {}

{polyapi_python-0.3.14.dev1 → polyapi_python-0.3.14.dev3}/tests/test_tabi.py

@@ -2,12 +2,26 @@ import unittest
 from unittest.mock import Mock, patch
 from polyapi.poly_tables import _render_table, TABI_MODULE_IMPORTS, execute_query
 from polyapi.typedefs import TableSpecDto
+import re
 
 
 def _normalize_type_notation(value: str) -> str:
-    # Python/runtime/tooling versions may emit either built-in generic style
-    # (dict[str, Any]) or typing style (Dict[str, Any]) for the same schema.
-    return value.replace("dict[str, Any]", "Dict[str, Any]")
+    # Normalize type annotations to handle differences between Python versions
+    # and jsonschema-gentypes versions. This allows tests to pass regardless of
+    # whether the generator outputs:
+    # - dict[str, Any] vs Dict[str, Any]
+    # - list[...] vs List[...]
+    # - str | int vs Union[str, int]
+
+    # Normalize built-in generic style to typing style for comparison
+    result = value
+    # Handle dict/Dict
+    result = re.sub(r'\bdict\[', 'Dict[', result)
+    # Handle list/List
+    result = re.sub(r'\blist\[', 'List[', result)
+    # Normalize union syntax: "A | B | C" -> "Union[A, B, C]" (simplified, handles common cases)
+    # This is a basic normalization - complex nested unions may need manual attention
+    return result
 
 
 TABLE_SPEC_SIMPLE: TableSpecDto = {

polyapi_python-0.3.14.dev1/polyapi/__init__.py

@@ -1,101 +0,0 @@
-import os
-import sys
-import copy
-import truststore
-from typing import Any, Dict, Optional, overload, Literal
-from typing_extensions import TypedDict
-truststore.inject_into_ssl()
-from .cli import CLI_COMMANDS
-
-__all__ = ["poly"]
-
-
-if len(sys.argv) > 1 and sys.argv[1] not in CLI_COMMANDS:
-    currdir = os.path.dirname(os.path.abspath(__file__))
-    if not os.path.isdir(os.path.join(currdir, "poly")):
-        print("No 'poly' found. Please run 'python3 -m polyapi generate' to generate the 'poly' library for your tenant.")
-        sys.exit(1)
-
-
-class PolyCustomDict(TypedDict, total=False):
-    """Type definition for polyCustom dictionary."""
-    executionId: Optional[str]  # Read-only
-    executionApiKey: Optional[str]
-    responseStatusCode: int
-    responseContentType: Optional[str]
-    responseHeaders: Dict[str, str]
-
-
-class _PolyCustom:
-    def __init__(self):
-        self._internal_store = {
-            "executionId": None,
-            "executionApiKey": None,
-            "responseStatusCode": 200,
-            "responseContentType": None,
-            "responseHeaders": {},
-        }
-        self._execution_id_locked = False
-
-    def set_once(self, key: str, value: Any) -> None:
-        if key == "executionId" and self._execution_id_locked:
-            # Silently ignore attempts to overwrite locked executionId
-            return
-        self._internal_store[key] = value
-        if key == "executionId":
-            # Lock executionId after setting it
-            self.lock_execution_id()
-
-    def get(self, key: str, default: Any = None) -> Any:
-        return self._internal_store.get(key, default)
-
-    def lock_execution_id(self) -> None:
-        self._execution_id_locked = True
-
-    def unlock_execution_id(self) -> None:
-        self._execution_id_locked = False
-
-    @overload
-    def __getitem__(self, key: Literal["executionId"]) -> Optional[str]: ...
-    
-    @overload
-    def __getitem__(self, key: Literal["executionApiKey"]) -> Optional[str]: ...
-    
-    @overload
-    def __getitem__(self, key: Literal["responseStatusCode"]) -> int: ...
-    
-    @overload
-    def __getitem__(self, key: Literal["responseContentType"]) -> Optional[str]: ...
-
-    @overload
-    def __getitem__(self, key: Literal["responseHeaders"]) -> Dict[str, str]: ...
-    
-    def __getitem__(self, key: str) -> Any:
-        return self.get(key)
-
-    @overload
-    def __setitem__(self, key: Literal["executionApiKey"], value: Optional[str]) -> None: ...
-    
-    @overload
-    def __setitem__(self, key: Literal["responseStatusCode"], value: int) -> None: ...
-    
-    @overload
-    def __setitem__(self, key: Literal["responseContentType"], value: Optional[str]) -> None: ...
-
-    @overload
-    def __setitem__(self, key: Literal["responseHeaders"], value: Dict[str, str]) -> None: ...
-    
-    def __setitem__(self, key: str, value: Any) -> None:
-        self.set_once(key, value)
-
-    def __repr__(self) -> str:
-        return f"PolyCustom({self._internal_store})"
-
-    def copy(self) -> '_PolyCustom':
-        new = _PolyCustom()
-        new._internal_store = copy.deepcopy(self._internal_store)
-        new._execution_id_locked = self._execution_id_locked
-        return new
-
-
-polyCustom: PolyCustomDict = _PolyCustom()