UncountablePythonSDK 0.0.99__tar.gz → 0.0.101__tar.gz

{uncountablepythonsdk-0.0.99/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: UncountablePythonSDK
-Version: 0.0.99
+Version: 0.0.101
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: UncountablePythonSDK
-Version: 0.0.99
+Version: 0.0.101
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ pkgs/type_spec/__init__.py
 pkgs/type_spec/__main__.py
 pkgs/type_spec/builder.py
 pkgs/type_spec/config.py
+pkgs/type_spec/cross_output_links.py
 pkgs/type_spec/emit_io_ts.py
 pkgs/type_spec/emit_open_api.py
 pkgs/type_spec/emit_open_api_util.py
@@ -229,6 +230,7 @@ uncountable/types/api/chemical/convert_chemical_formats.py
 uncountable/types/api/entity/__init__.py
 uncountable/types/api/entity/create_entities.py
 uncountable/types/api/entity/create_entity.py
+uncountable/types/api/entity/create_or_update_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

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/pkgs/type_spec/builder.py

@@ -13,6 +13,7 @@ from enum import Enum, StrEnum, auto
 from typing import Any, Self
 
 from . import util
+from .cross_output_links import CrossOutputPaths
 from .util import parse_type_str, unused
 
 RawDict = dict[Any, Any]
@@ -1321,7 +1322,11 @@ class NameDataPair:
 
 class SpecBuilder:
     def __init__(
-        self, *, api_endpoints: dict[EndpointKey, str], top_namespace: str
+        self,
+        *,
+        api_endpoints: dict[EndpointKey, str],
+        top_namespace: str,
+        cross_output_paths: CrossOutputPaths | None,
     ) -> None:
         self.top_namespace = top_namespace
         self.where: list[str] = []
@@ -1332,6 +1337,7 @@ class SpecBuilder:
         self.examples: dict[str, list[SpecEndpointExample]] = defaultdict(list)
         self.guides: dict[SpecGuideKey, list[SpecGuide]] = defaultdict(list)
         self.api_endpoints = api_endpoints
+        self.cross_output_paths = cross_output_paths
         base_namespace = SpecNamespace(name=base_namespace_name)
         for base_type in BaseTypeName:
             defn = SpecTypeDefnObject(base_namespace, base_type, is_base=True)

uncountablepythonsdk-0.0.101/pkgs/type_spec/cross_output_links.py

@@ -0,0 +1,105 @@
+from __future__ import annotations
+
+import os
+from dataclasses import dataclass
+
+from pkgs.type_spec import builder
+
+
+def get_python_stub_file_path(
+    function_name: str | None,
+) -> str | None:
+    if function_name is None:
+        return None
+    module_dir, file_name, func_name = function_name.rsplit(".", 2)
+    module_path = os.path.relpath(module_dir.replace(".", "/"))
+    api_stub_file = f"{module_path}/{file_name}.py"
+    return api_stub_file
+
+
+@dataclass(kw_only=True, frozen=True)
+class CrossOutputPaths:
+    python_types_output: str
+    typescript_types_output: str
+    typescript_routes_output: str
+    typespec_files_input: list[str]
+
+
+def get_python_api_file_path(
+    cross_output_paths: CrossOutputPaths,
+    namespace: builder.SpecNamespace,
+) -> str:
+    return f"{cross_output_paths.python_types_output}/{'/'.join(namespace.path)}{'' if len(namespace.path) > 1 else '_t'}.py"
+
+
+def get_typescript_api_file_path(
+    cross_output_paths: CrossOutputPaths,
+    namespace: builder.SpecNamespace,
+) -> str:
+    return (
+        f"{cross_output_paths.typescript_routes_output}/{'/'.join(namespace.path)}.tsx"
+    )
+
+
+def get_yaml_api_file_path(
+    cross_output_paths: CrossOutputPaths,
+    namespace: builder.SpecNamespace,
+) -> str:
+    abs_path = next(
+        (
+            path
+            for path in cross_output_paths.typespec_files_input
+            if (
+                namespace.endpoint is None
+                or namespace.endpoint.default_endpoint_key in path
+            )
+        ),
+        cross_output_paths.typespec_files_input[0],
+    )
+    return f"{os.path.relpath(abs_path)}/{'/'.join(namespace.path)}.yaml"
+
+
+def get_return_to_root_path(path: str) -> str:
+    return "../" * (path.count("/"))
+
+
+def get_path_links(
+    cross_output_paths: CrossOutputPaths | None,
+    namespace: builder.SpecNamespace,
+    *,
+    current_path_type: str,
+) -> str:
+    if cross_output_paths is None:
+        return ""
+
+    api_paths = {
+        "Python": get_python_api_file_path(cross_output_paths, namespace),
+        "TypeScript": get_typescript_api_file_path(cross_output_paths, namespace),
+        "YAML": get_yaml_api_file_path(cross_output_paths, namespace),
+    }
+
+    assert current_path_type in api_paths
+
+    comment_prefix = "#"
+    if current_path_type == "TypeScript":
+        comment_prefix = "//"
+
+    return_to_root_path = get_return_to_root_path(api_paths[current_path_type])
+    del api_paths[current_path_type]
+
+    paths_string = ""
+    for path_name, path in api_paths.items():
+        paths_string += (
+            f"{comment_prefix} {path_name}: file://./{return_to_root_path}{path}\n"
+        )
+
+    if namespace.endpoint is not None:
+        for (
+            endpoint,
+            path_specific_endpoint,
+        ) in namespace.endpoint.path_per_api_endpoint.items():
+            path_from_root = get_python_stub_file_path(path_specific_endpoint.function)
+            if path_from_root is None:
+                continue
+            paths_string += f"{comment_prefix} Implementation for {endpoint}: file://./{return_to_root_path}{path_from_root}\n"
+    return paths_string

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/pkgs/type_spec/emit_python.py

@@ -7,6 +7,7 @@ from typing import Any
 from . import builder, util
 from .builder import EndpointEmitType, EndpointSpecificPath
 from .config import PythonConfig
+from .cross_output_links import get_path_links
 
 INDENT = "    "
 LINE_BREAK = "\n"
@@ -354,6 +355,13 @@ def _get_epf_root(endpoint_specific_path: EndpointSpecificPath) -> str:
 def _emit_namespace(ctx: Context, namespace: builder.SpecNamespace) -> None:
     endpoint = namespace.endpoint
     if endpoint is not None:
+        path_links = get_path_links(
+            ctx.builder.cross_output_paths, namespace, current_path_type="Python"
+        )
+        if path_links != "":
+            ctx.out.write("\n")
+            ctx.out.write(path_links)
+
         ctx.out.write("\n")
         ctx.out.write(f'{ENDPOINT_METHOD} = "{endpoint.method.upper()}"\n')
         for endpoint_specific_path in sorted(

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/pkgs/type_spec/emit_typescript.py

@@ -4,6 +4,7 @@ import os
 from . import builder, util
 from .builder import EndpointKey, EndpointSpecificPath
 from .config import TypeScriptConfig
+from .cross_output_links import get_path_links
 from .emit_io_ts import emit_type_io_ts
 from .emit_typescript_util import (
     MODIFY_NOTICE,
@@ -32,7 +33,11 @@ def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
         builder.namespaces.values(),
         key=lambda ns: resolve_namespace_name(ns),
     ):
-        ctx = EmitTypescriptContext(out=io.StringIO(), namespace=namespace)
+        ctx = EmitTypescriptContext(
+            out=io.StringIO(),
+            namespace=namespace,
+            cross_output_paths=builder.cross_output_paths,
+        )
 
         _emit_namespace(ctx, config, namespace)
 
@@ -139,6 +144,10 @@ def _emit_endpoint(
     if not is_binary:
         assert endpoint.result_type == builder.ResultType.json
 
+    paths_string = get_path_links(
+        ctx.cross_output_paths, namespace, current_path_type="TypeScript"
+    )
+
     data_loader_head = ""
     data_loader_body = ""
     if endpoint.data_loader:
@@ -236,7 +245,8 @@ export type Response = DeprecatedResult
         endpoint_path_part = f"""appSpecificApiPath({{{path_lookup_map}
   }}),"""
 
-    tsx_api = f"""{MODIFY_NOTICE}
+    # tsx_api = f"""{MODIFY_NOTICE}
+    tsx_api = f"""{MODIFY_NOTICE}{paths_string}
 {data_loader_head}{tsx_response_part}
 export const apiCall = {wrap_call}(
   {endpoint_path_part}

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/pkgs/type_spec/emit_typescript_util.py

@@ -3,12 +3,12 @@ import typing
 from dataclasses import dataclass, field
 
 from . import builder, util
+from .cross_output_links import CrossOutputPaths
 
 INDENT = "  "
 
 MODIFY_NOTICE = "// DO NOT MODIFY -- This file is generated by type_spec\n"
 
-
 base_name_map = {
     builder.BaseTypeName.s_boolean: "boolean",
     builder.BaseTypeName.s_date: "string",  # IMPROVE: Aliased DateStr
@@ -31,6 +31,7 @@ class EmitTypescriptContext:
     out: io.StringIO
     namespace: builder.SpecNamespace
     namespaces: set[builder.SpecNamespace] = field(default_factory=set)
+    cross_output_paths: CrossOutputPaths | None = None
 
 
 def ts_type_name(name: str) -> str:

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/pkgs/type_spec/load_types.py

@@ -8,6 +8,7 @@ from pkgs.serialization import yaml
 
 from .builder import SpecBuilder
 from .config import Config
+from .cross_output_links import CrossOutputPaths
 
 ext_map = {
     ".ts": "typescript",
@@ -41,8 +42,21 @@ def find_and_handle_files(
 
 
 def load_types(config: Config) -> SpecBuilder | None:
+    if config.typescript is not None and config.python is not None:
+        cross_output_paths = CrossOutputPaths(
+            python_types_output=config.python.types_output,
+            typescript_types_output=config.typescript.types_output,
+            typescript_routes_output=config.typescript.routes_output,
+            typespec_files_input=config.type_spec_types,
+            # IMPROVE not sure how to know which one is the correct one in emit_typescript
+        )
+    else:
+        cross_output_paths = None
+
     builder = SpecBuilder(
-        api_endpoints=config.api_endpoint, top_namespace=config.top_namespace
+        api_endpoints=config.api_endpoint,
+        top_namespace=config.top_namespace,
+        cross_output_paths=cross_output_paths,
     )
 
     def handle_builder_add(

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/uncountable/types/__init__.py

@@ -19,6 +19,7 @@ from .api.chemical import convert_chemical_formats as convert_chemical_formats_t
 from .api.entity import create_entities as create_entities_t
 from .api.entity import create_entity as create_entity_t
 from .api.inputs import create_inputs as create_inputs_t
+from .api.entity import create_or_update_entity as create_or_update_entity_t
 from .api.recipes import create_recipe as create_recipe_t
 from .api.recipe_links import create_recipe_link as create_recipe_link_t
 from .api.recipes import create_recipes as create_recipes_t
@@ -127,6 +128,7 @@ __all__: list[str] = [
     "create_entities_t",
     "create_entity_t",
     "create_inputs_t",
+    "create_or_update_entity_t",
     "create_recipe_t",
     "create_recipe_link_t",
     "create_recipes_t",

uncountablepythonsdk-0.0.101/uncountable/types/api/entity/create_or_update_entity.py

@@ -0,0 +1,46 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+import dataclasses
+from pkgs.serialization import serial_class
+from ... import async_batch_t
+from ... import entity_t
+from ... import field_values_t
+from ... import identifier_t
+
+__all__: list[str] = [
+    "Arguments",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+]
+
+ENDPOINT_METHOD = "POST"
+ENDPOINT_PATH = "api/external/entity/create_or_update_entity"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.create_or_update_entity.Arguments",
+)
+@dataclasses.dataclass(kw_only=True)
+class Arguments:
+    entity_type: entity_t.EntityType
+    definition_key: identifier_t.IdentifierKey
+    field_values: list[field_values_t.FieldArgumentValue]
+    entity_key: identifier_t.IdentifierKey | None = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.create_or_update_entity.Data",
+)
+@dataclasses.dataclass(kw_only=True)
+class Data(async_batch_t.AsyncBatchActionReturn):
+    pass
+# DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/uncountable/types/async_batch_processor.py

@@ -9,9 +9,11 @@ import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 import uncountable.types.api.equipment.associate_equipment_input as associate_equipment_input_t
 import uncountable.types.api.recipes.associate_recipe_as_input as associate_recipe_as_input_t
+import uncountable.types.api.recipes.associate_recipe_as_lot as associate_recipe_as_lot_t
 from uncountable.types import async_batch_t
 from uncountable.types import base_t
 import uncountable.types.api.recipes.clear_recipe_outputs as clear_recipe_outputs_t
+import uncountable.types.api.entity.create_or_update_entity as create_or_update_entity_t
 import uncountable.types.api.recipes.create_recipe as create_recipe_t
 import uncountable.types.api.recipes.edit_recipe_inputs as edit_recipe_inputs_t
 from uncountable.types import entity_t
@@ -112,6 +114,41 @@ class AsyncBatchProcessorBase(ABC):
             batch_reference=req.batch_reference,
         )
 
+    def associate_recipe_as_lot(
+        self,
+        *,
+        recipe_key: identifier_t.IdentifierKey,
+        ingredient_key: identifier_t.IdentifierKey,
+        depends_on: list[str] | None = None,
+    ) -> async_batch_t.QueuedAsyncBatchRequest:
+        """Create a new lot association for the provided recipe with the provided ingredient
+
+        :param recipe_key: Identifier for the recipe
+        :param ingredient_key: Identifier for the ingredient
+        :param depends_on: A list of batch reference keys to process before processing this request
+        """
+        args = associate_recipe_as_lot_t.Arguments(
+            recipe_key=recipe_key,
+            ingredient_key=ingredient_key,
+        )
+        json_data = serialize_for_api(args)
+
+        batch_reference = str(uuid.uuid4())
+
+        req = async_batch_t.AsyncBatchRequest(
+            path=async_batch_t.AsyncBatchRequestPath.ASSOCIATE_RECIPE_AS_LOT,
+            data=json_data,
+            depends_on=depends_on,
+            batch_reference=batch_reference,
+        )
+
+        self._enqueue(req)
+
+        return async_batch_t.QueuedAsyncBatchRequest(
+            path=req.path,
+            batch_reference=req.batch_reference,
+        )
+
     def clear_recipe_outputs(
         self,
         *,
@@ -144,6 +181,43 @@ class AsyncBatchProcessorBase(ABC):
             batch_reference=req.batch_reference,
         )
 
+    def create_or_update_entity(
+        self,
+        *,
+        entity_type: entity_t.EntityType,
+        definition_key: identifier_t.IdentifierKey,
+        field_values: list[field_values_t.FieldArgumentValue],
+        entity_key: identifier_t.IdentifierKey | None = None,
+        depends_on: list[str] | None = None,
+    ) -> async_batch_t.QueuedAsyncBatchRequest:
+        """Creates or updates field values for an entity
+
+        :param depends_on: A list of batch reference keys to process before processing this request
+        """
+        args = create_or_update_entity_t.Arguments(
+            entity_key=entity_key,
+            entity_type=entity_type,
+            definition_key=definition_key,
+            field_values=field_values,
+        )
+        json_data = serialize_for_api(args)
+
+        batch_reference = str(uuid.uuid4())
+
+        req = async_batch_t.AsyncBatchRequest(
+            path=async_batch_t.AsyncBatchRequestPath.CREATE_OR_UPDATE_ENTITY,
+            data=json_data,
+            depends_on=depends_on,
+            batch_reference=batch_reference,
+        )
+
+        self._enqueue(req)
+
+        return async_batch_t.QueuedAsyncBatchRequest(
+            path=req.path,
+            batch_reference=req.batch_reference,
+        )
+
     def create_recipe(
         self,
         *,

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/uncountable/types/async_batch_t.py

@@ -37,6 +37,8 @@ class AsyncBatchRequestPath(StrEnum):
     CLEAR_RECIPE_OUTPUTS = "recipes/clear_recipe_outputs"
     GRANT_ENTITY_PERMISSIONS = "entity/grant_entity_permissions"
     SET_ENTITY_FIELD_VALUES = "entity/set_entity_field_values"
+    ASSOCIATE_RECIPE_AS_LOT = "recipes/associate_recipe_as_lot"
+    CREATE_OR_UPDATE_ENTITY = "entity/create_or_update_entity"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.99 → uncountablepythonsdk-0.0.101}/uncountable/types/client_base.py

@@ -20,6 +20,7 @@ import uncountable.types.api.chemical.convert_chemical_formats as convert_chemic
 import uncountable.types.api.entity.create_entities as create_entities_t
 import uncountable.types.api.entity.create_entity as create_entity_t
 import uncountable.types.api.inputs.create_inputs as create_inputs_t
+import uncountable.types.api.entity.create_or_update_entity as create_or_update_entity_t
 import uncountable.types.api.recipes.create_recipe as create_recipe_t
 import uncountable.types.api.recipe_links.create_recipe_link as create_recipe_link_t
 import uncountable.types.api.recipes.create_recipes as create_recipes_t
@@ -332,6 +333,30 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=create_inputs_t.Data)
 
+    def create_or_update_entity(
+        self,
+        *,
+        entity_type: entity_t.EntityType,
+        definition_key: identifier_t.IdentifierKey,
+        field_values: list[field_values_t.FieldArgumentValue],
+        entity_key: identifier_t.IdentifierKey | None = None,
+    ) -> create_or_update_entity_t.Data:
+        """Creates or updates field values for an entity
+
+        """
+        args = create_or_update_entity_t.Arguments(
+            entity_key=entity_key,
+            entity_type=entity_type,
+            definition_key=definition_key,
+            field_values=field_values,
+        )
+        api_request = APIRequest(
+            method=create_or_update_entity_t.ENDPOINT_METHOD,
+            endpoint=create_or_update_entity_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=create_or_update_entity_t.Data)
+
     def create_recipe(
         self,
         *,