UncountablePythonSDK 0.0.7__tar.gz → 0.0.9__tar.gz

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.7
+Version: 0.0.9
 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,9 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: requests>=2.31.0
+Requires-Dist: requests==2.31.0
+Requires-Dist: SQLAlchemy==2.0.29
+Requires-Dist: APScheduler==3.10.4
 Provides-Extra: test
 Requires-Dist: mypy>=1.8.1; extra == "test"
 Requires-Dist: ruff>=0.2.1; extra == "test"

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.7
+Version: 0.0.9
 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,9 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: requests>=2.31.0
+Requires-Dist: requests==2.31.0
+Requires-Dist: SQLAlchemy==2.0.29
+Requires-Dist: APScheduler==3.10.4
 Provides-Extra: test
 Requires-Dist: mypy>=1.8.1; extra == "test"
 Requires-Dist: ruff>=0.2.1; extra == "test"

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -79,12 +79,38 @@ uncountable/__init__.py
 uncountable/py.typed
 uncountable/core/__init__.py
 uncountable/core/client.py
+uncountable/integration/__init__.py
+uncountable/integration/construct_client.py
+uncountable/integration/cron.py
+uncountable/integration/entrypoint.py
+uncountable/integration/job.py
+uncountable/integration/server.py
+uncountable/integration/types.py
+uncountable/integration/db/__init__.py
+uncountable/integration/db/connect.py
+uncountable/integration/executors/__init__.py
+uncountable/integration/executors/script_executor.py
 uncountable/types/__init__.py
 uncountable/types/base.py
+uncountable/types/calculations.py
 uncountable/types/client_base.py
+uncountable/types/curves.py
 uncountable/types/entity.py
+uncountable/types/experiment_groups.py
 uncountable/types/field_values.py
+uncountable/types/fields.py
+uncountable/types/input_attributes.py
+uncountable/types/inputs.py
+uncountable/types/outputs.py
+uncountable/types/phases.py
 uncountable/types/recipe_links.py
+uncountable/types/recipe_metadata.py
+uncountable/types/recipe_output_metadata.py
+uncountable/types/recipe_tags.py
+uncountable/types/response.py
+uncountable/types/units.py
+uncountable/types/users.py
+uncountable/types/workflows.py
 uncountable/types/api/__init__.py
 uncountable/types/api/batch/__init__.py
 uncountable/types/api/batch/execute_batch.py

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/UncountablePythonSDK.egg-info/requires.txt

@@ -1,4 +1,6 @@
-requests>=2.31.0
+requests==2.31.0
+SQLAlchemy==2.0.29
+APScheduler==3.10.4
 
 [test]
 mypy>=1.8.1

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/argument_parser/argument_parser.py

@@ -407,5 +407,5 @@ class CachedParser(typing.Generic[T]):
             return self.parse_storage(yaml.safe_load(data_in))
 
     def parse_yaml_resource(self, package: resources.Package, resource: str) -> T:
-        raw_data = resources.read_text(package, resource)
-        return self.parse_storage(yaml.safe_load(raw_data))
+        with resources.open_text(package, resource) as fp:
+            return self.parse_storage(yaml.safe_load(fp))

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/serialization/missing_sentry.py

@@ -26,5 +26,5 @@ MISSING_SENTRY = MissingSentryType()
 MissingType = Union[MissingSentryType, ClassT]
 
 
-def coalesce_missing_sentry(value: MissingType[ClassT]) -> ClassT | None:
+def coalesce_missing_sentry(value: MissingType[ClassT]) -> Optional[ClassT]:
     return None if isinstance(value, MissingSentryType) else value

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/serialization_util/serialization_helpers.py

@@ -1,4 +1,5 @@
 import datetime
+import enum
 from decimal import Decimal
 from typing import (
     TYPE_CHECKING,
@@ -33,6 +34,8 @@ else:
 def key_convert_to_camelcase(o: Any) -> Any:
     if isinstance(o, OpaqueKey):
         return o
+    if isinstance(o, enum.Enum):
+        return o.value
     if isinstance(o, str):
         return snake_to_camel_case(o)
     return o

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/type_spec/emit_open_api.py

@@ -141,6 +141,18 @@ def _serialize_global_context(ctx: EmitOpenAPIGlobalContext) -> str:
     return yaml.dump(oa_root, sort_keys=False)
 
 
+def _emit_endpoint_parameters(typ: OpenAPIType | None) -> dict[str, list[dict[str, str]]]:
+    if not isinstance(typ, OpenAPIObjectType):
+        return {}
+
+    return {
+        "parameters": [
+            {"$ref": f"#/components/schema/Arguments/{prop_name}"}
+            for prop_name in typ.properties
+        ]
+    }
+
+
 def _emit_namespace(
     gctx: EmitOpenAPIGlobalContext,
     ctx: EmitOpenAPIContext,
@@ -159,23 +171,28 @@ def _emit_namespace(
     if ctx.endpoint is not None:
         endpoint = ctx.endpoint
 
+        argument_type = ctx.types.get("Arguments")
         oa_endpoint = dict()
-        oa_endpoint[endpoint.method] = {
-            "tags": endpoint.tags,
-            "summary": endpoint.summary,
-            "description": endpoint.description,
-            "parameters": {"$ref": "#/components/schema/Arguments"},
-            "responses": {
-                "200": {
-                    "description": "OK",
-                    "content": {
-                        "application/json": {
-                            "schema": {"$ref": "#/components/schema/Data"}
-                        }
-                    },
-                }
-            },
-        }
+        oa_endpoint[endpoint.method] = (
+            {
+                "tags": endpoint.tags,
+                "summary": endpoint.summary,
+                "description": endpoint.description,
+            }
+            | _emit_endpoint_parameters(argument_type)
+            | {
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "content": {
+                            "application/json": {
+                                "schema": {"$ref": "#/components/schema/Data"}
+                            }
+                        },
+                    }
+                },
+            }
+        )
         oa_components["endpoint"] = oa_endpoint
 
     types = ctx.types
@@ -460,5 +477,5 @@ def open_api_type(
     ctx.namespaces.add(stype.namespace)
     # external namespace resolution
     return OpenAPIRefType(
-        source=f"{resolve_namespace_ref(ctx, stype.namespace, config=config)}/{stype.name}"
+        source=f"{resolve_namespace_ref(source_path=ctx.namespace.path, ref_path=stype.namespace.path, ref='/components/schema')}/{stype.name}"
     )

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/type_spec/emit_open_api_util.py

@@ -9,7 +9,6 @@ from dataclasses import dataclass, field
 from typing import TypeAlias
 
 from . import builder
-from .config import OpenAPIConfig
 from .open_api_util import OpenAPIType
 
 MODIFY_NOTICE = "# DO NOT MODIFY -- This file is generated by type_spec"
@@ -75,12 +74,8 @@ class EmitOpenAPIContext:
 
 
 def resolve_namespace_ref(
-    ctx: EmitOpenAPIContext,
-    namespace: builder.SpecNamespace,
-    *,
-    config: OpenAPIConfig,
+    *, source_path: list[str], ref_path: list[str], ref: str
 ) -> str:
-    # TODO: Handle namespaces not in root directory
-    if len(ctx.namespace.path) == 1:
-        return f"{namespace.name}.yaml#/components/schema"
-    return f"{config.static_url_path}/common/{namespace.name}.yaml#/components/schema"
+    to_root = "/".join(".." for _ in source_path)
+    location = "/".join(ref_path)
+    return f"{to_root}/common/{location}.yaml#{ref}"

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/type_spec/emit_python.py

@@ -335,14 +335,15 @@ def _emit_namespace(ctx: Context, namespace: builder.SpecNamespace) -> None:
 
 
 def _validate_supports_handler_generation(
-    stype: builder.SpecTypeDefn, name: str
+    stype: builder.SpecTypeDefn, name: str, supports_inheritance: bool = False
 ) -> builder.SpecTypeDefnObject:
     assert isinstance(
         stype, builder.SpecTypeDefnObject
     ), f"External api {name} must be an object"
-    assert (
-        stype.base is None or stype.base.is_base
-    ), f"Inheritance not supporterd in external api {name}"
+    if not supports_inheritance:
+        assert (
+            stype.base is None or stype.base.is_base
+        ), f"Inheritance not supported in external api {name}"
     return stype
 
 
@@ -359,7 +360,9 @@ def _emit_endpoint_invocation_function(
     data_type = namespace.types["Data"]
 
     arguments_type = _validate_supports_handler_generation(arguments_type, "arguments")
-    data_type = _validate_supports_handler_generation(data_type, "response")
+    data_type = _validate_supports_handler_generation(
+        data_type, "response", supports_inheritance=True
+    )
 
     endpoint_method_stype = builder.SpecTypeDefnObject(
         namespace=arguments_type.namespace, name=ENDPOINT_METHOD

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pkgs/type_spec/open_api_util.py

@@ -13,9 +13,10 @@ class OpenAPIType(ABC):
         self.nullable = nullable
 
     @abstractmethod
-    def asdict(self) -> dict[str, object]: ...
+    def asdict(self) -> dict[str, object]:
+        pass
 
-    def asarguments(self) -> list[dict[str, object]]:
+    def asarguments(self) -> dict[str, dict[str, object]]:
         raise UnsupportedOperation
 
     def add_addl_info(self, emitted: dict[str, object]) -> dict[str, object]:
@@ -147,8 +148,8 @@ class OpenAPIFreeFormObjectType(OpenAPIType):
     def asdict(self) -> dict[str, object]:
         return self.add_addl_info({"type": "object"})
 
-    def asarguments(self) -> list[dict[str, object]]:
-        return []
+    def asarguments(self) -> dict[str, dict[str, object]]:
+        return {}
 
 
 class OpenAPIObjectType(OpenAPIType):
@@ -185,17 +186,17 @@ class OpenAPIObjectType(OpenAPIType):
             },
         })
 
-    def asarguments(self) -> list[dict[str, object]]:
-        argument_types: list[dict[str, object]] = []
+    def asarguments(self) -> dict[str, dict[str, object]]:
+        argument_types: dict[str, dict[str, object]] = {}
         for property_name, property_type in self.properties.items():
             desc = self.property_desc.get(property_name)
-            argument_types.append({
+            argument_types[property_name] = {
                 "name": property_name,
                 "in": "query",
                 "schema": property_type.asdict(),
                 "required": not property_type.nullable,
                 "description": desc or "",
-            })
+            }
         return argument_types
 
 
@@ -219,11 +220,11 @@ class OpenAPIUnionType(OpenAPIType):
         # TODO: use parents description and nullable
         return {"oneOf": [base_type.asdict() for base_type in self.base_types]}
 
-    def asarguments(self) -> list[dict[str, object]]:
+    def asarguments(self) -> dict[str, dict[str, object]]:
         # TODO handle inheritence (allOf and refs); need to inline here...
         # for now skip this endpoint
 
-        return []
+        return {}
 
 
 class OpenAPIIntersectionType(OpenAPIType):
@@ -246,8 +247,8 @@ class OpenAPIIntersectionType(OpenAPIType):
         # TODO: use parents description and nullable
         return {"allOf": [base_type.asdict() for base_type in self.base_types]}
 
-    def asarguments(self) -> list[dict[str, object]]:
+    def asarguments(self) -> dict[str, dict[str, object]]:
         # TODO handle inheritence (allOf and refs); need to inline here...
         # for now skip this endpoint
 
-        return []
+        return {}

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/pyproject.toml

@@ -48,7 +48,9 @@ keywords = [ "uncountable", "sdk", "api", "uncountable-sdk" ]
 requires-python = ">=3.11"
 # May be compatible with older versions
 dependencies = [
-    "requests >= 2.31.0",
+    "requests == 2.31.0",
+    "SQLAlchemy == 2.0.29",
+    "APScheduler == 3.10.4",
 ]
 dynamic = ["version"]
 

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/entity/create_entities.yaml

@@ -16,7 +16,7 @@ Arguments:
     type: Object
     properties:
         definition_id:
-            type: Integer
+            type: ObjectId
             desc: "Definition id for the entities to create"
         entity_type:
             type: Union<Literal<entity.EntityType.lab_request>, Literal<entity.EntityType.approval>, Literal<entity.EntityType.custom_entity>, Literal<entity.EntityType.task>, Literal<entity.EntityType.project>>

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/entity/create_entity.yaml

@@ -23,7 +23,7 @@ Arguments:
     type: Object
     properties:
         definition_id:
-            type: Integer
+            type: ObjectId
             desc: "Definition id of the entity to create"
         entity_type:
             type: Union<Literal<entity.EntityType.lab_request>, Literal<entity.EntityType.approval>, Literal<entity.EntityType.custom_entity>, Literal<entity.EntityType.task>, Literal<entity.EntityType.project>>

UncountablePythonSDK-0.0.9/type_spec/external/api/entity/get_entities_data.yaml

@@ -0,0 +1,29 @@
+$endpoint:
+    is_sdk: true
+    method: get
+    path: ${external}/entity/external_get_entities_data
+    function: main.site.app.external.entity.get_entities_data.get_entities_data
+    desc: "Gets the details for a passed entity"
+Arguments:
+    type: Object
+    properties:
+        entity_ids:
+            type: List<ObjectId>
+            desc: "Ids of the entity to retrieve"
+        entity_type:
+            type: entity.EntityType
+            desc: "The type of the entities requested, e.g. lab_request or approval"
+
+EntityDetails:
+    type: Object
+    properties:
+        entity:
+            type: entity.Entity
+        field_values:
+            type: List<field_values.FieldRefIdNameValue>
+
+Data:
+    type: Object
+    properties:
+        entity_details:
+            type: List<EntityDetails>

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/entity/list_entities.yaml

@@ -8,7 +8,7 @@ Arguments:
     type: Object
     properties:
         entity_type:
-            type: String
+            type: entity.EntityType
             desc: "The type of the entities requested, e.g. lab_request, recipe"
         config_reference:
             type: String
@@ -16,28 +16,18 @@ Arguments:
         attributes?:
             type: Dict<OpaqueKey, JsonValue>
             desc: "Attributes to pass to the configuration for parameterizing filters"
-        offset:
+        offset?:
             type: Optional<Integer>
             desc: "Used for pagination. Pagination is done based on the sorting of the config"
-        limit:
+        limit?:
             type: Optional<Integer>
             desc: "The number of data points to return. If not filled in, it will be set to 100, and cannot be set higher than 100"
 
-Entity:
-    type: Object
-    properties:
-        id:
-            type: Integer
-            desc: "A unique identifier for the entity.  Used in conjunction with entity type"
-        type:
-            type: String
-            desc: "The type of entity"
-
 EntityResult:
     type: Object
     properties:
         entity:
-            type: Entity
+            type: entity.Entity
             desc: "The entity represented by the record"
         column_values:
             type: List<JsonValue>

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/entity/resolve_entity_ids.yaml

@@ -8,10 +8,10 @@ Arguments:
     type: Object
     properties:
         entity_ids:
-            type: List<Union<String, Integer>>
+            type: List<Union<String, ObjectId>>
             desc: "Ids of the entity to retrieve"
         entity_type:
-            type: String
+            type: entity.EntityType
             desc: "The type of the entities requested"
 
 EntityNames:

UncountablePythonSDK-0.0.9/type_spec/external/api/entity/set_values.yaml

@@ -0,0 +1,18 @@
+$endpoint:
+    is_sdk: true
+    method: post
+    path: ${external}/entity/external_set_values
+    function: main.site.app.external.entity.set_values.set_values
+    desc: "Sets field values for an entity"
+
+Arguments:
+    type: Object
+    properties:
+        entity:
+            type: entity.Entity
+        values:
+            type: List<field_values.ArgumentValueRefName>
+
+Data:
+    type: response.Response
+    properties:

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/input_groups/get_input_group_names.yaml

@@ -9,14 +9,14 @@ Arguments:
     type: Object
     properties:
         material_family_id:
-            type: Integer
+            type: ObjectId
             desc: "Required: The Material Family ID to get the input groups from."
 
 SimpleInputGroup:
     type: Object
     properties:
         input_group_id:
-            type: Integer
+            type: ObjectId
             desc: "The unique integer ID of the input group. Used for joining and identification elsewhere"
         name:
             type: String

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/inputs/create_inputs.yaml

@@ -19,39 +19,26 @@ InputToCreate:
         name:
             type: String
         material_family_ids:
-            type: List<Integer>
+            type: List<ObjectId>
             desc: "The list of material families to add the ingredient to.  This must be non-empty"
         quantity_type:
-            type: Union<Literal<'numeric'>, Literal<'text'>>
+            type: Union<Literal<inputs.IngredientQuantityType.numeric>, Literal<inputs.IngredientQuantityType.text>>
             desc: "The quantity type of the input.  Always numeric for standard inputs"
         type:
-            type: Union<Literal<'ingredient'>, Literal<'process_parameter'>>
+            type: Union<Literal<inputs.IngredientType.ingredient>, Literal<inputs.IngredientType.process_parameter>>
             desc: "The type of the input, E.g. ingredient, process parameter"
         attributes?:
-            type: List<InputAttributeValue>
+            type: List<input_attributes.InputAttributeValue>
             desc: "The attributes of the input"
         category_id?:
-            type: Integer
+            type: ObjectId
             desc: The unique identifier for the category to set for the input
 
-InputAttributeValue:
-    type: Object
-    properties:
-        attribute_id:
-            type: Integer
-            desc: "A unique identifier for the attribute."
-        quantity_dec?:
-            type: Decimal
-            desc: "The value for the metadata, if it is of numeric type"
-        quantity_json?:
-            type: JsonValue
-            desc: "The value for the metadata, if it is not of numeric type"
-
 InputSimple:
     type: Object
     properties:
         input_id:
-            type: Integer
+            type: ObjectId
             desc: "A unique identifier for the id"
 
 Data:

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/inputs/get_input_data.yaml

@@ -9,39 +9,26 @@ Arguments:
     type: Object
     properties:
         material_family_id:
-            type: Integer
+            type: ObjectId
             desc: "The material family ID to get the input values from."
         input_ids:
-            type: Optional<List<Integer>>
+            type: Optional<List<ObjectId>>
             desc: "The input IDs to get the data from. If this is not filled in, all inputs from a material family will be returned (in paginated form)."
-        offset:
+        offset?:
             type: Optional<Integer>
             desc: "Used for pagination, where the number of results returned exceeds the limit. Results are always ordered by the input ID"
         is_parameter:
             type: Optional<Boolean>
             desc: "Whether to get parameters or ingredients. By default both are returned. When set to true, only parameters are returned, and when set to false, only ingredients are returned"
-        limit:
+        limit?:
             type: Optional<Integer>
             desc: "The maximum number of results to return. By default this is set to 1,000 and it cannot be set higher than 1,000"
 
-InputAttrVal:
-    type: Object
-    properties:
-        attribute_id:
-            type: Integer
-            desc: "The unique integer ID for the input attribute value. Used for joining and identification elsewhere."
-        quantity_dec:
-            type: Decimal
-            desc: "The value for the attribute, if it is of numeric type"
-        quantity_json:
-            type: JsonValue
-            desc: "The value for the attribute, if it is not of numeric type"
-
 SimpleInputAttr:
     type: Object
     properties:
         attribute_id:
-            type: Integer
+            type: ObjectId
             desc: "The unique integer ID for the input attribute value. Used for joining and identification elsewhere."
         name:
             type: String
@@ -54,7 +41,7 @@ SimpleInputGlobalCategory:
     type: Object
     properties:
         category_id:
-            type: Integer
+            type: ObjectId
             desc: "The unique integer ID for the global category. Used for joining and identification elsewhere."
         name:
             type: String
@@ -64,7 +51,7 @@ SimpleInputSubcategory:
     type: Object
     properties:
         subcategory_id:
-            type: Integer
+            type: ObjectId
             desc: "The unique integer ID for the subcategory. Used for joining and identification elsewhere."
         name:
             type: String
@@ -74,7 +61,7 @@ FullInput:
     type: Object
     properties:
         input_id:
-            type: Integer
+            type: ObjectId
             desc: "The unique integer ID of the input value. Used for joining and identification elsewhere"
         name:
             type: String
@@ -86,13 +73,13 @@ FullInput:
             type: Boolean
             desc: "Whether the input is a process parameter (true) or an ingredient (false)"
         attributes:
-            type: List<InputAttrVal>
+            type: List<input_attributes.InputAttributeValue>
             desc: "Attributes associated with an input, such as CAS number, density, etc."
         global_category_id:
-            type: Integer
+            type: Optional<ObjectId>
             desc: "The global category ID associated with the input"
         subcategory_ids:
-            type: List<Integer>
+            type: List<ObjectId>
             desc: "The subcategory IDs associated with an input. Inputs can be placed into an unlimited number of subcategories"
 
 Data:

{UncountablePythonSDK-0.0.7 → UncountablePythonSDK-0.0.9}/type_spec/external/api/inputs/get_input_names.yaml

@@ -9,15 +9,15 @@ Arguments:
     type: Object
     properties:
         material_family_id:
-            type: Integer
+            type: ObjectId
             desc: "The material family ID to get the input values from"
-        offset:
+        offset?:
             type: Optional<Integer>
             desc: "Used for pagination, where the number of results returned exceeds the limit. Results are always ordered by the input ID"
         is_parameter:
             type: Optional<Boolean>
             desc: "Whether to get parameters or ingredients. By default both are returned. When set to true, only parameters are returned, and when set to false, only ingredients are returned"
-        limit:
+        limit?:
             type: Optional<Integer>
             desc: "The maximum number of results to return. By default this is set to 20,000 and it cannot be set higher than 20,000"
 
@@ -25,7 +25,7 @@ InputWithName:
     type: Object
     properties:
         input_id:
-            type: Integer
+            type: ObjectId
             desc: "The unique integer ID of the input value. Used for joining and identification elsewhere"
         name:
             type: String