UncountablePythonSDK 0.0.74__tar.gz → 0.0.76__tar.gz

{uncountablepythonsdk-0.0.74/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.74
+Version: 0.0.76
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -16,7 +16,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aiotus==0.*
+Requires-Dist: aiotus==1.*
 Requires-Dist: aiohttp==3.*
 Requires-Dist: requests==2.*
 Requires-Dist: SQLAlchemy>=1.4.0

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.74
+Version: 0.0.76
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -16,7 +16,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aiotus==0.*
+Requires-Dist: aiotus==1.*
 Requires-Dist: aiohttp==3.*
 Requires-Dist: requests==2.*
 Requires-Dist: SQLAlchemy>=1.4.0

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -136,6 +136,8 @@ uncountable/types/__init__.py
 uncountable/types/async_batch.py
 uncountable/types/async_batch_processor.py
 uncountable/types/async_batch_t.py
+uncountable/types/auth_retrieval.py
+uncountable/types/auth_retrieval_t.py
 uncountable/types/base.py
 uncountable/types/base_t.py
 uncountable/types/calculations.py
@@ -165,6 +167,8 @@ uncountable/types/input_attributes.py
 uncountable/types/input_attributes_t.py
 uncountable/types/inputs.py
 uncountable/types/inputs_t.py
+uncountable/types/integration_server.py
+uncountable/types/integration_server_t.py
 uncountable/types/job_definition.py
 uncountable/types/job_definition_t.py
 uncountable/types/outputs.py
@@ -217,6 +221,7 @@ uncountable/types/api/entity/__init__.py
 uncountable/types/api/entity/create_entities.py
 uncountable/types/api/entity/create_entity.py
 uncountable/types/api/entity/get_entities_data.py
+uncountable/types/api/entity/grant_entity_permissions.py
 uncountable/types/api/entity/list_entities.py
 uncountable/types/api/entity/lock_entity.py
 uncountable/types/api/entity/resolve_entity_ids.py
@@ -267,6 +272,7 @@ uncountable/types/api/recipes/create_recipe.py
 uncountable/types/api/recipes/create_recipes.py
 uncountable/types/api/recipes/disassociate_recipe_as_input.py
 uncountable/types/api/recipes/edit_recipe_inputs.py
+uncountable/types/api/recipes/get_column_calculation_values.py
 uncountable/types/api/recipes/get_curve.py
 uncountable/types/api/recipes/get_recipe_calculations.py
 uncountable/types/api/recipes/get_recipe_links.py

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/UncountablePythonSDK.egg-info/requires.txt

@@ -1,4 +1,4 @@
-aiotus==0.*
+aiotus==1.*
 aiohttp==3.*
 requests==2.*
 SQLAlchemy>=1.4.0

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/docs/requirements.txt

@@ -2,6 +2,6 @@ furo==2024.8.6
 myst-parser==4.0.0
 sphinx-autoapi==3.3.0
 sphinx-copybutton==0.5.2
-Sphinx==8.0.0
+Sphinx==8.1.3
 sphinx_design==0.6.1
 sphinx-favicon==1.0.1

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/examples/async_batch.py

@@ -1,3 +1,4 @@
+import os
 from decimal import Decimal
 
 from uncountable.core import AsyncBatchProcessor, AuthDetailsApiKey, Client
@@ -11,10 +12,9 @@ from uncountable.types.recipe_identifiers import (
 )
 
 client = Client(
-    base_url="https://app.uncountable.com",
+    base_url=os.environ["UNC_BASE_URL"],
     auth_details=AuthDetailsApiKey(
-        api_id="X",
-        api_secret_key="X",
+        api_id=os.environ["UNC_API_ID"], api_secret_key=os.environ["UNC_API_SECRET_KEY"]
     ),
 )
 batch_loader = AsyncBatchProcessor(client=client)

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/pkgs/serialization/serial_class.py

@@ -103,6 +103,9 @@ def _get_merged_serial_class_data(type_class: type[Any]) -> _SerialClassData | N
         if hasattr(type_class, "__unc_serial_data")
         else None
     )
+    if base_class_data is None:
+        return None
+
     if type_class.__bases__ is not None:
         for base in type_class.__bases__:
             curr_base_class_data = _get_merged_serial_class_data(base)

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/pkgs/type_spec/builder.py

@@ -535,13 +535,8 @@ class SpecTypeDefnObject(SpecTypeDefn):
         base_type: list[SpecType] = [self.base] if self.base is not None else []
         return base_type + prop_types
 
-    def get_generic(self) -> Optional[str]:
-        if len(self.parameters) > 0:
-            assert (
-                len(self.parameters) == 1
-            ), "Only single generic parameters current supported"
-            return self.parameters[0]
-        return None
+    def get_generics(self) -> list[str]:
+        return self.parameters
 
 
 class SpecTypeDefnAlias(SpecTypeDefn):
@@ -1134,7 +1129,11 @@ class SpecNamespace:
                 spec_type = SpecTypeDefnStringEnum(self, name)
             else:
                 parameters = (
-                    [parameter.name for parameter in parsed_name.parameters[0]]
+                    [
+                        parameter.name
+                        for name_parameters in parsed_name.parameters
+                        for parameter in name_parameters
+                    ]
                     if parsed_name.parameters is not None
                     else None
                 )

{uncountablepythonsdk-0.0.74 → uncountablepythonsdk-0.0.76}/pkgs/type_spec/emit_python.py

@@ -814,11 +814,11 @@ def _emit_type(ctx: Context, stype: builder.SpecType) -> None:
 
     class_out = io.StringIO()
     base_class = ""
-    generic = stype.get_generic()
+    generics = stype.get_generics()
     if not stype.base.is_base:
         base_class = f"({refer_to(ctx, stype.base)})"
-    elif generic is not None:
-        base_class = f"(typing.Generic[{generic}])"
+    elif len(generics) > 0:
+        base_class = f"(typing.Generic[{", ".join(generics)}])"
     class_out.write(f"class {stype.name}{base_class}:\n")
 
     emitted_properties_metadata = _emit_type_properties(
@@ -829,7 +829,7 @@ def _emit_type(ctx: Context, stype: builder.SpecType) -> None:
     to_string_values = emitted_properties_metadata.to_string_values
     parse_require = emitted_properties_metadata.parse_require
 
-    _emit_generic(ctx, stype.get_generic())
+    _emit_generics(ctx, generics)
 
     # Emit serial_class decorator
     ctx.out.write("@serial_class(\n")
@@ -864,8 +864,8 @@ def _emit_type(ctx: Context, stype: builder.SpecType) -> None:
     ctx.out.write(class_out.getvalue())
 
 
-def _emit_generic(ctx: Context, generic: Optional[str]) -> None:
-    if generic is not None:
+def _emit_generics(ctx: Context, generics: list[str]) -> None:
+    for generic in generics:
         ctx.out.write(f'{generic} = typing.TypeVar("{generic}")\n')
         ctx.out.write(f"{LINE_BREAK}{LINE_BREAK}")
 

uncountablepythonsdk-0.0.76/pkgs/type_spec/emit_typescript.py

@@ -0,0 +1,256 @@
+import io
+import os
+
+from . import builder, util
+from .config import TypeScriptConfig
+from .emit_io_ts import emit_type_io_ts
+from .emit_typescript_util import (
+    MODIFY_NOTICE,
+    EmitTypescriptContext,
+    emit_namespace_imports_ts,
+    emit_type_ts,
+    emit_value_ts,
+    resolve_namespace_name,
+    resolve_namespace_ref,
+    ts_type_name,
+)
+
+
+def emit_typescript(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
+    _emit_types(builder, config)
+    _emit_id_source(builder, config)
+
+
+def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
+    index_out = io.StringIO()
+    index_out.write(MODIFY_NOTICE)
+
+    index_out_end = io.StringIO()
+
+    for namespace in sorted(
+        builder.namespaces.values(),
+        key=lambda ns: resolve_namespace_name(ns),
+    ):
+        ctx = EmitTypescriptContext(out=io.StringIO(), namespace=namespace)
+
+        _emit_namespace(ctx, config, namespace)
+
+        prepart = builder.preparts["typescript"].get(namespace.name)
+        part = builder.parts["typescript"].get(namespace.name)
+
+        # Don't emit an empty file
+        if (
+            prepart is None
+            and part is None
+            and len(namespace.types) == 0
+            and len(namespace.constants) == 0
+        ):
+            # Try to capture some common incompleteness errors
+            if namespace.endpoint is None or namespace.endpoint.function is None:
+                raise Exception(
+                    f"Namespace {"/".join(namespace.path)} is incomplete. It should have an endpoint with function, types, and/or constants"
+                )
+            continue
+
+        full = io.StringIO()
+        if prepart:
+            full.write(MODIFY_NOTICE)
+            full.write(f"// === START section from {namespace.name}.ts.prepart ===\n")
+            full.write(prepart)
+            full.write(f"// === END section from {namespace.name}.ts.prepart ===\n")
+            full.write("\n")
+
+        emit_namespace_imports_ts(ctx.namespaces, out=full, current_namespace=namespace)
+        if namespace.emit_io_ts:
+            full.write("import * as IO from 'io-ts';")
+        full.write(ctx.out.getvalue())
+
+        if part:
+            full.write("\n")
+            full.write(MODIFY_NOTICE)
+            full.write(f"// === START section from {namespace.name}.ts.part ===\n")
+            full.write(part)
+            full.write(f"// === END section from {namespace.name}.ts.part ===\n")
+
+        full.write(MODIFY_NOTICE)
+
+        basename = "/".join(namespace.path)
+        filename = f"{config.types_output}/{basename}.ts"
+        util.rewrite_file(filename, full.getvalue())
+
+        if len(namespace.path) == 1:
+            index_out.write(
+                f"import * as {resolve_namespace_ref(namespace)} from './{resolve_namespace_name(namespace)}'\n"
+            )  # noqa: E501
+            index_out_end.write(f"export {{{resolve_namespace_ref(namespace)}}}\n")
+
+    index_out.write("\n")
+    index_out.write(MODIFY_NOTICE)
+    index_out.write(index_out_end.getvalue())
+    index_out.write(MODIFY_NOTICE)
+    util.rewrite_file(f"{config.types_output}/index.ts", index_out.getvalue())
+
+
+def _emit_namespace(
+    ctx: EmitTypescriptContext,
+    config: TypeScriptConfig,
+    namespace: builder.SpecNamespace,
+) -> None:
+    for stype in namespace.types.values():
+        if namespace.emit_io_ts:
+            emit_type_io_ts(ctx, stype, namespace.derive_types_from_io_ts)
+        if not namespace.emit_io_ts or not namespace.derive_types_from_io_ts:
+            emit_type_ts(ctx, stype)
+
+    for sconst in namespace.constants.values():
+        _emit_constant(ctx, sconst)
+
+    if namespace.endpoint is not None:
+        _emit_endpoint(ctx, config, namespace, namespace.endpoint)
+
+
+def _emit_endpoint(
+    ctx: EmitTypescriptContext,
+    config: TypeScriptConfig,
+    namespace: builder.SpecNamespace,
+    endpoint: builder.SpecEndpoint,
+) -> None:
+    if endpoint.suppress_ts:
+        return
+
+    assert namespace.path[0] == "api"
+    has_arguments = "Arguments" in namespace.types
+    has_data = "Data" in namespace.types
+    has_deprecated_result = "DeprecatedResult" in namespace.types
+    is_binary = endpoint.result_type == builder.ResultType.binary
+
+    result_type_count = sum([has_data, has_deprecated_result, is_binary])
+    assert result_type_count < 2
+
+    # Don't emit interface for those with unsupported types
+    if not has_arguments or result_type_count == 0:
+        return
+
+    if not is_binary:
+        assert endpoint.result_type == builder.ResultType.json
+
+    data_loader_head = ""
+    data_loader_body = ""
+    if endpoint.data_loader:
+        # Don't support alternately named data for now
+        assert has_data
+
+        data_loader_head = (
+            'import { buildApiDataLoader, argsKey } from "unc_base/data_manager"\n'
+        )
+        data_loader_body = (
+            "\nexport const data = buildApiDataLoader(argsKey(), apiCall)\n"
+        )
+
+    method = endpoint.method.capitalize()
+    if endpoint.has_attachment:
+        assert endpoint.method == "post"
+        method = f"{method}Attach"
+    wrap_name = (
+        f"buildWrappedBinary{method}Call" if is_binary else f"buildWrapped{method}Call"
+    )
+    wrap_call = (
+        f"{wrap_name}<Arguments>" if is_binary else f"{wrap_name}<Arguments, Response>"
+    )
+    type_path = f"unc_mat/types/{"/".join(namespace.path)}"
+
+    if is_binary:
+        tsx_response_part = f"""import {{ {wrap_name} }} from "unc_base/api"
+import type {{ Arguments }} from "{type_path}"
+
+export type {{ Arguments }}
+"""
+    elif has_data and endpoint.has_attachment:
+        tsx_response_part = f"""import {{ {wrap_name}, type AttachmentResponse }} from "unc_base/api"
+import type {{ Arguments, Data }} from "{type_path}"
+
+export type {{ Arguments, Data }}
+export type Response = AttachmentResponse<Data>
+"""
+    elif has_data:
+        tsx_response_part = f"""import {{ {wrap_name}, type JsonResponse }} from "unc_base/api"
+import type {{ Arguments, Data }} from "{type_path}"
+
+export type {{ Arguments, Data }}
+export type Response = JsonResponse<Data>
+"""
+
+    else:
+        assert has_deprecated_result
+        tsx_response_part = f"""import {{ {wrap_name} }} from "unc_base/api"
+import type {{ Arguments, DeprecatedResult }} from "{type_path}"
+
+export type {{ Arguments }}
+export type Response = DeprecatedResult
+"""
+
+    tsx_api = f"""{MODIFY_NOTICE}
+{data_loader_head}{tsx_response_part}
+export const apiCall = {wrap_call}(
+  "{endpoint.path_root}/{endpoint.path_dirname}/{endpoint.path_basename}",
+)
+{data_loader_body}"""
+
+    output = f"{config.routes_output}/{"/".join(namespace.path)}.tsx"
+    util.rewrite_file(output, tsx_api)
+
+    # Hacky index support, until enough is migrated to regen entirely
+    # Emits the import into the UI API index file
+    index_path = f"{config.routes_output}/{"/".join(namespace.path[0:-1])}/index.tsx"
+    api_name = f"Api{ts_type_name(namespace.path[0 - 1])}"
+    if os.path.exists(index_path):
+        with open(index_path) as index:
+            index_data = index.read()
+            need_index = index_data.find(api_name) == -1
+    else:
+        need_index = True
+
+    if need_index:
+        with open(index_path, "a") as index:
+            print(f"Updated API Index {index_path}")
+            index.write(f'import * as {api_name} from "./{namespace.path[-1]}"\n\n')
+            index.write(f"export {{ {api_name} }}\n")
+
+
+def _emit_constant(ctx: EmitTypescriptContext, sconst: builder.SpecConstant) -> None:
+    ctx.out.write("\n\n")
+    ctx.out.write(MODIFY_NOTICE)
+    value = emit_value_ts(ctx, sconst.value_type, sconst.value)
+    const_name = sconst.name.upper()
+    ctx.out.write(f"export const {const_name} = {value}\n")
+
+
+def _emit_id_source(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
+    id_source_output = config.id_source_output
+    if id_source_output is None:
+        return
+    enum_out = io.StringIO()
+    enum_out.write(MODIFY_NOTICE)
+
+    enum_out.write("export type KnownEnumsType =\n")
+    enum_map = {
+        builder.resolve_proper_name(string_enum): string_enum
+        for string_enum in builder.emit_id_source_enums
+    }
+    sorted_keys = sorted(enum_map.keys())
+    for key in sorted_keys:
+        enum_out.write(f'  | "{key}"\n')
+
+    enum_out.write(f"\n{MODIFY_NOTICE}")
+    enum_out.write("export const ENUM_NAME_MAPS = {\n")
+    for key in sorted_keys:
+        string_enum = enum_map[key]
+        enum_out.write(f'  "{builder.resolve_proper_name(string_enum)}": {{\n')
+        for entry in string_enum.values.values():
+            if entry.label is not None:
+                enum_out.write(f'    "{entry.value}": "{entry.label}",\n')
+        enum_out.write("  },\n")
+    enum_out.write("}\n")
+
+    enum_out.write(f"\n{MODIFY_NOTICE}")
+    util.rewrite_file(id_source_output, enum_out.getvalue())