UncountablePythonSDK 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

{UncountablePythonSDK-0.0.6.dist-info → UncountablePythonSDK-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.6
+Version: 0.0.7
 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.6.dist-info → UncountablePythonSDK-0.0.7.dist-info}/RECORD

@@ -17,12 +17,12 @@ pkgs/strenum_compat/__init__.py,sha256=wXRFeNvBm8RU6dy1PFJ5sRLgUIEeH_DVR95Sv5qpG
 pkgs/strenum_compat/strenum_compat.py,sha256=vGJlrMZpOqiGXvv21IbS0amdB2xQ2CdYKvnfEfHLr8E,156
 pkgs/type_spec/__init__.py,sha256=h5DmJTca4QVV10sZR1x0-MlkZfuGYDfapR3zHvXfzto,19
 pkgs/type_spec/__main__.py,sha256=5bJaX9Y_-FavP0qwzhk-z-V97UY7uaezJTa1zhO_HHQ,1048
-pkgs/type_spec/builder.py,sha256=lvpaS0p9v5kdr1I_bfEANwAKpcD5dJQBMFlz9AuCqPA,41260
-pkgs/type_spec/config.py,sha256=8Vai7eqiSo9sg343xwQyIvThNDFrj966Qvj-EYaUZ1E,4821
+pkgs/type_spec/builder.py,sha256=Pl3UzHYgci3XRYsJ-pEsrdKu26mrJeLQv66OS2KePGc,38993
+pkgs/type_spec/config.py,sha256=wXALehQr_CcteOY_KbeI3rtmGgqVzHcveAhgKCDfQoQ,4934
 pkgs/type_spec/emit_io_ts.py,sha256=gCEfS81w_ifqjLVJ3_cpy9Gq03o6H5nEsh35WAkqGGE,5606
-pkgs/type_spec/emit_open_api.py,sha256=Gz_i1CGcXqg4dgHYPHAt6iMs6DshYsKkmZQlrjLhrkQ,16799
-pkgs/type_spec/emit_open_api_util.py,sha256=t6WaUDUNrwxF0A03Mv1GIfXOS7rxTVtr72jWJv61az0,1972
-pkgs/type_spec/emit_python.py,sha256=xVFTKVVe54ZCnok2G7-KMcfO9nOCI_eFF5XHiIRMNDU,35375
+pkgs/type_spec/emit_open_api.py,sha256=8tidMRWubBmiiq-XCu_2732IvwTc6R3miurdlBCv3-w,16939
+pkgs/type_spec/emit_open_api_util.py,sha256=S4eHeryxiGUNujypmwn8UZQSlaCCWn7uMpiZzNJJqCg,2054
+pkgs/type_spec/emit_python.py,sha256=Y-3eXhWwWns2wZQwcriMN3rgNN20ad5NDphKbGkdCwI,35459
 pkgs/type_spec/emit_typescript.py,sha256=6tlzvyHc7iIEic01AtjYWuzy7Ac3KijtXRQ3IQSN7JE,18670
 pkgs/type_spec/emit_typescript_util.py,sha256=MZMigIsYIYOXLjJqp-DSRYsztWbIKd9QQEmYRRqnGQ4,894
 pkgs/type_spec/load_types.py,sha256=LMIkrk0n-Kh4I4CUOBzuboYtsAHBYuMrL9d2hkU83f4,2184
@@ -39,8 +39,8 @@ pkgs/type_spec/value_spec/convert_type.py,sha256=SAYyEV6orQJJbkXSE4hhtOQJ2vKUXJC
 pkgs/type_spec/value_spec/emit_python.py,sha256=M9NyHi-akTw4cUsHCEK7rsFirb8ngYThiIW7xh2xSko,6943
 pkgs/type_spec/value_spec/types.py,sha256=a2zxbbCRWepY1l8OtjeCDKgBKFPFHVgV99oP6pTtaro,441
 type_spec/external/api/batch/execute_batch.yaml,sha256=gpdSev3sLEC_cMVSZdj-9bc_XDFDqdPdOII9Ojme2N8,1170
-type_spec/external/api/entity/create_entities.yaml,sha256=NkG14sP3K0Z8Tfxnaqh8pzjsoJJNWsfDCaMSbQEbqU0,1582
-type_spec/external/api/entity/create_entity.yaml,sha256=wSCT8ddc8Qzk-kqjEtjk-VXsrNoVgEYb94JE5HkHn_U,1410
+type_spec/external/api/entity/create_entities.yaml,sha256=7DqYSkUPUwAN6e6P9Nx8Fzl7I2xsV5qZZQiRAOsiWG4,1057
+type_spec/external/api/entity/create_entity.yaml,sha256=yQpvVJJO7RnLCCpZTztTRmuQncIIobhEQYftLODTljE,1252
 type_spec/external/api/entity/get_entities_data.yaml,sha256=-whdM4l4xsAb_kc-bHdNEwJr4pCN7WA4Y7z-CBJXRag,1470
 type_spec/external/api/entity/list_entities.yaml,sha256=pMNfFIbnc8onE1I4yiCXJSAXGZa0IaiPTe_cQ1HM27I,2030
 type_spec/external/api/entity/resolve_entity_ids.yaml,sha256=Of5zyjHYzxVZEjknTxVlJMnsAxdgOWWaerPdKwdybjc,720
@@ -60,7 +60,7 @@ type_spec/external/api/recipe_metadata/get_recipe_metadata_data.yaml,sha256=MbNI
 type_spec/external/api/recipes/create_recipes.yaml,sha256=8JnRVjQ_vDKYKXbgZ6Z_RBcm5WechFvw_hg8oJ_6zcs,1930
 type_spec/external/api/recipes/get_curve.yaml,sha256=Th1HDGN6EXLYAiOusnjAXylfgc6OpKbYlc9MpZnGujQ,1592
 type_spec/external/api/recipes/get_recipe_calculations.yaml,sha256=pnZtQH4S8_tAL5a1laI3QhAugJU_AbqMyK7zszIHqj4,1440
-type_spec/external/api/recipes/get_recipe_links.yaml,sha256=dWTfblo8iQxA02nX-Ac9LL_qj4g_mEZtVLepptQqm7g,1639
+type_spec/external/api/recipes/get_recipe_links.yaml,sha256=VXpJndQt04rmTvT7v7FdcyfBhg1u1B3_a7iGeeoSXWk,765
 type_spec/external/api/recipes/get_recipe_names.yaml,sha256=lfZGDRl8__cjYPtH9fPFHRnOgmae192x2l5b4xTxBZo,894
 type_spec/external/api/recipes/get_recipe_output_metadata.yaml,sha256=Y9fszN16FFnfxo9SfIkzS8fDnZ20L6_iBVyHaPN58uI,1584
 type_spec/external/api/recipes/get_recipes_data.yaml,sha256=Q41ci5cbGPuEYR72HLu4f-0Kl_Za4QPmzNbtp2fZtJ0,16291
@@ -70,15 +70,18 @@ uncountable/__init__.py,sha256=281cC2hs8pbrD0jVKMol-tbWSh7Zcsc8oRT42dKteyE,102
 uncountable/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/core/__init__.py,sha256=GCXRRhhYv-yKzqKjAij7GcNiOr90BBbgdhhpusWtmUc,100
 uncountable/core/client.py,sha256=jcJBGwe31fOqfGiUJzW_KMcfE0hax55jgVVliALBNLQ,4160
-uncountable/types/__init__.py,sha256=wZiDSz1VnngMpkZ8YWpig52q_bgumQ-6IBokeZ5jvU8,2772
+uncountable/types/__init__.py,sha256=NXgMS4P3ettpqcV1Hu96i8EliDd9SkcTt9tHU5jPdtg,2955
 uncountable/types/base.py,sha256=7yMC3sCQ13wd92896Ga2XbZffCqq98SKv09rFGb1ulg,2682
-uncountable/types/client_base.py,sha256=WugQoDJGNLB2uk57WurRaMHft4aZGEy1rcJqQuO602U,20330
+uncountable/types/client_base.py,sha256=pf8vo7Bl55XCUbXiUmQ4q6JrWZ0qufj_TEP8zNMAw5E,20388
+uncountable/types/entity.py,sha256=DypCKRn-xOOQoVkd3JpcEN9DbDZSAIgBVDziS6eM6GQ,11526
+uncountable/types/field_values.py,sha256=kBFSZVEMvK-wr1YMyK5RD4mw4LEI6aRIySJstX32ol4,743
+uncountable/types/recipe_links.py,sha256=8TfRnV8sWOQaZ57_2VGET5Avsa_k5hGlYqtGBdfEvjM,1353
 uncountable/types/api/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/batch/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/batch/execute_batch.py,sha256=cCZo_akwJR4_ET6oOBChdlrCQlxUw8V9i8tDpv7JTIc,1696
 uncountable/types/api/entity/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
-uncountable/types/api/entity/create_entities.py,sha256=XHXvgdEna8ryf4WR4rUSpA8yGNqUOvmIVtEnLSE20nU,1731
-uncountable/types/api/entity/create_entity.py,sha256=KpG_pm7dcM-0XKwpjWrwSpedorM-E1jTgi5vncqXfjI,1550
+uncountable/types/api/entity/create_entities.py,sha256=ivhGU4pIVT09H4mtZ8yhBO2SyfbtcdM_hZN4-8KEYVI,1403
+uncountable/types/api/entity/create_entity.py,sha256=xEmzm1H1LnMfSIUYvvfKgNKWaMFOBhFOctb1KPsEjdo,1604
 uncountable/types/api/entity/get_entities_data.py,sha256=Bp4J_7Gqz-gZtps0ClNHGZti7aGmEmgpaqCWkiYHcc8,1500
 uncountable/types/api/entity/list_entities.py,sha256=bCi3CRKw76-lK6qlMjva3ZHBDNnw2jMwjfTEzYAkULg,1542
 uncountable/types/api/entity/resolve_entity_ids.py,sha256=HRkW-q5eoin73co-C58HWpHuaODgXimRi4OHsaWOkoQ,992
@@ -104,13 +107,13 @@ uncountable/types/api/recipes/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8
 uncountable/types/api/recipes/create_recipes.py,sha256=ZvepPEwH9z5x31G7hYBlaKnYPCBu5sCHWsTajUSs_aM,1765
 uncountable/types/api/recipes/get_curve.py,sha256=-N5GUATarAR8eLzMCTuLz6VMx-dU6L741lBN2OzuO-4,1322
 uncountable/types/api/recipes/get_recipe_calculations.py,sha256=BltC1nSL0x-mGS1Q7XXp8Eg9WsgXJfjAI4YlNaLDIek,1460
-uncountable/types/api/recipes/get_recipe_links.py,sha256=kppNa9Q6ISX3QN3mbtfSivQrxeLWT_4EWhLzPqABCc0,1843
+uncountable/types/api/recipes/get_recipe_links.py,sha256=pcET39vQrzXTjCDDYP-3_0T0vFCJy5EIy8CNUSyzzWw,942
 uncountable/types/api/recipes/get_recipe_names.py,sha256=XC4FGUnRpvyGiQf3-1NbOD5ngBSpcSFHZ2dlIL6g2v8,931
 uncountable/types/api/recipes/get_recipe_output_metadata.py,sha256=z9M3S8QQYi82S3HiDktMYNNdaF4dVNkoLh3tqp7HY1I,1533
 uncountable/types/api/recipes/get_recipes_data.py,sha256=YPDNf2l6AdD0tEv2zqP3AK2bDLp7cGh2qiAdFiRWzeA,6608
 uncountable/types/api/recipes/set_recipe_inputs.py,sha256=XCt4ZN__OqGkvdwh6C9tKbIwiEPeptnfQVAV2p0cGWs,1259
 uncountable/types/api/recipes/set_recipe_outputs.py,sha256=rCs1Gayxon8UY4lTHiErJOLVAVCdMaUsevBX-d1gpo4,1560
-UncountablePythonSDK-0.0.6.dist-info/METADATA,sha256=PQ5ULMkXWfgPj64ezMKoTPtOUa23bmRYGluNB01Ai0Q,1125
-UncountablePythonSDK-0.0.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-UncountablePythonSDK-0.0.6.dist-info/top_level.txt,sha256=8ga1DCSWt4Uc_XJ5cR0QrDQuyoeo2uoSzaAJdQT2KBo,36
-UncountablePythonSDK-0.0.6.dist-info/RECORD,,
+UncountablePythonSDK-0.0.7.dist-info/METADATA,sha256=mtk2qN2P0ST2d_sIb6e6XxFOCmOaTFHcUW8_aOKNIZE,1125
+UncountablePythonSDK-0.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+UncountablePythonSDK-0.0.7.dist-info/top_level.txt,sha256=8ga1DCSWt4Uc_XJ5cR0QrDQuyoeo2uoSzaAJdQT2KBo,36
+UncountablePythonSDK-0.0.7.dist-info/RECORD,,

{UncountablePythonSDK-0.0.6.dist-info → UncountablePythonSDK-0.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pkgs/type_spec/builder.py

@@ -949,52 +949,6 @@ class SpecNamespace:
                 )
             self.types[name] = spec_type
 
-    def _validate_external_type_impl(
-        self, stype: SpecType, rec_stack: list[SpecType]
-    ) -> bool:
-        if stype in rec_stack[:-1]:
-            # recursive type definition ignore this instance
-            return True
-
-        if isinstance(stype, SpecTypeDefn):
-            if stype.is_base or stype.is_predefined:
-                # predefined and base types are always allowed
-                return True
-
-            if stype.namespace != self:
-                # deny access to outside namespaces
-                return False
-
-        if isinstance(stype, SpecTypeDefnExternal):
-            # external type definitions not support for external endpoints
-            return False
-
-        # check that referenced types themselves are allowed
-        for child_type in stype.get_referenced_types():
-            if not self._validate_external_type_wrap(child_type, rec_stack):
-                return False
-
-        return True
-
-    def _print_external_type_stack(self, rec_stack: list[SpecType]) -> None:
-        print(" -> ".join([str(x) for x in rec_stack]))
-
-    def _validate_external_type_wrap(
-        self, stype: SpecType, rec_stack: list[SpecType]
-    ) -> bool:
-        rec_stack.append(stype)
-        if not self._validate_external_type_impl(stype, rec_stack):
-            return False
-        rec_stack.pop()
-        return True
-
-    def _validate_external_type(self, stype: SpecType) -> bool:
-        rec_stack: list[SpecType] = []
-        if not self._validate_external_type_wrap(stype, rec_stack):
-            self._print_external_type_stack(rec_stack)
-            return False
-        return True
-
     def process(self, builder: SpecBuilder, data: RawDict) -> None:
         """
         Complete the definition of each type.
@@ -1023,21 +977,6 @@ class SpecNamespace:
 
             builder.pop_where()
 
-        # validate external endpoints
-        if self.endpoint is not None and self.endpoint.is_external:
-            # external endpoints are only allowed to reference types defined in the same namespace
-            for name, defn in self.types.items():
-                builder.push_where(name)
-
-                if not self._validate_external_type(defn):
-                    print(builder.where)
-                    print(
-                        f"Type '{name}' of external endpoint declaration references internal type definition!"
-                    )
-                    raise BuilderException()
-
-                builder.pop_where()
-
         builder.pop_where()
 
 

pkgs/type_spec/config.py

@@ -74,6 +74,9 @@ class PythonConfig(BaseLanguageConfig):
 class OpenAPIConfig(BaseLanguageConfig):
     types_output: str  # The folder to put generated openapi api yaml
     description: str  # Description of api documentation
+    static_url_path: (
+        str  # the base path where the generated yaml are hosted, e.g. /static/docs
+    )
     server_url: str | None = None
 
     def __post_init__(self: Self) -> None:

pkgs/type_spec/emit_open_api.py

@@ -97,9 +97,6 @@ def emit_open_api(builder: builder.SpecBuilder, *, config: OpenAPIConfig) -> Non
     )
 
     for namespace in sorted(builder.namespaces.values(), key=lambda ns: ns.name):
-        if namespace.endpoint is None:
-            continue
-
         ctx = EmitOpenAPIContext(namespace=namespace)
 
         if ctx.namespace.name == "base":
@@ -111,7 +108,7 @@ def emit_open_api(builder: builder.SpecBuilder, *, config: OpenAPIConfig) -> Non
             gctx,
             ctx,
             namespace=namespace,
-            types_output=config.types_output,
+            config=config,
         )
 
     _rewrite_with_notice(
@@ -149,10 +146,10 @@ def _emit_namespace(
     ctx: EmitOpenAPIContext,
     namespace: builder.SpecNamespace,
     *,
-    types_output: str,
+    config: OpenAPIConfig,
 ) -> None:
     for stype in namespace.types.values():
-        _emit_type(ctx, stype)
+        _emit_type(ctx, stype, config=config)
 
     if namespace.endpoint is not None:
         _emit_endpoint(gctx, ctx, namespace, namespace.endpoint)
@@ -218,12 +215,17 @@ def _emit_namespace(
         },
     )
 
-    path = f"{types_output}/common/{'/'.join(namespace.path)}.yaml"
+    path = f"{config.types_output}/common/{'/'.join(namespace.path)}.yaml"
     oa_namespace = {"components": oa_components}
     _rewrite_with_notice(path, yaml.dump(oa_namespace, sort_keys=False))
 
 
-def _emit_type(ctx: EmitOpenAPIContext, stype: builder.SpecType) -> None:
+def _emit_type(
+    ctx: EmitOpenAPIContext,
+    stype: builder.SpecType,
+    *,
+    config: OpenAPIConfig,
+) -> None:
     if not isinstance(stype, builder.SpecTypeDefn):
         return
     if stype.is_base or stype.is_predefined:
@@ -239,7 +241,7 @@ def _emit_type(ctx: EmitOpenAPIContext, stype: builder.SpecType) -> None:
 
     assert stype.is_exported, "expecting exported names"
     if isinstance(stype, builder.SpecTypeDefnAlias):
-        ctx.types[stype.name] = open_api_type(ctx, stype.alias)
+        ctx.types[stype.name] = open_api_type(ctx, stype.alias, config=config)
         return
 
     if isinstance(stype, builder.SpecTypeDefnStringEnum):
@@ -259,14 +261,14 @@ def _emit_type(ctx: EmitOpenAPIContext, stype: builder.SpecType) -> None:
         return
     elif stype.properties is None:
         # TODO: check if these are actually equivalent
-        ctx.types[stype.name] = open_api_type(ctx, stype.base)
+        ctx.types[stype.name] = open_api_type(ctx, stype.base, config=config)
         return
     else:
         properties: dict[str, OpenAPIType] = dict()
         property_desc: dict[str, str] = dict()
 
         for prop in stype.properties.values():
-            ref_type = open_api_type(ctx, prop.spec_type)
+            ref_type = open_api_type(ctx, prop.spec_type, config=config)
             prop_name = ts_name(prop.name, prop.name_case or stype.name_case)
             if prop.desc:
                 property_desc[prop_name] = prop.desc
@@ -294,7 +296,10 @@ def _emit_type(ctx: EmitOpenAPIContext, stype: builder.SpecType) -> None:
 
     if not stype.base.is_base:
         # support inheritance via allOf
-        final_type = OpenAPIIntersectionType([open_api_type(ctx, stype.base), final_type])
+        final_type = OpenAPIIntersectionType([
+            open_api_type(ctx, stype.base, config=config),
+            final_type,
+        ])
 
     ctx.types[stype.name] = final_type
 
@@ -398,31 +403,37 @@ def _emit_value(stype: builder.SpecType, value: object) -> str:
         raise Exception("invalid constant type", value, stype)
 
 
-def open_api_type(ctx: EmitOpenAPIContext, stype: builder.SpecType) -> OpenAPIType:
+def open_api_type(
+    ctx: EmitOpenAPIContext,
+    stype: builder.SpecType,
+    *,
+    config: OpenAPIConfig,
+) -> OpenAPIType:
     if isinstance(stype, builder.SpecTypeInstance):
         if stype.defn_type.name == builder.BaseTypeName.s_list:
-            return OpenAPIArrayType(open_api_type(ctx, stype.parameters[0]))
+            return OpenAPIArrayType(
+                open_api_type(ctx, stype.parameters[0], config=config)
+            )
         if stype.defn_type.name == builder.BaseTypeName.s_union:
-            return OpenAPIUnionType([open_api_type(ctx, p) for p in stype.parameters])
+            return OpenAPIUnionType([
+                open_api_type(ctx, p, config=config) for p in stype.parameters
+            ])
         if stype.defn_type.name == builder.BaseTypeName.s_literal:
             # IMPROVE relax the string constraint for literals (for now treat as string)
             parts = []
             for parameter in stype.parameters:
                 assert isinstance(parameter, builder.SpecTypeLiteralWrapper)
-                param_type = open_api_type(ctx, parameter)
-
-                assert isinstance(param_type, OpenAPIEnumType)
-                parts.extend(param_type.options)
+                parts.append(parameter.value)
 
             return OpenAPIEnumType([str(x) for x in parts])
         if stype.defn_type.name == builder.BaseTypeName.s_optional:
-            ref_type = open_api_type(ctx, stype.parameters[0])
+            ref_type = open_api_type(ctx, stype.parameters[0], config=config)
             ref_type.nullable = True
             return ref_type
         if stype.defn_type.name == builder.BaseTypeName.s_tuple:
             # IMPROVE potentially handle tuples better: for now map tupples to arrays of those types
             return OpenAPIArrayType(
-                [open_api_type(ctx, p) for p in stype.parameters],
+                [open_api_type(ctx, p, config=config) for p in stype.parameters],
                 description="TupleType",
             )
 
@@ -449,5 +460,5 @@ def open_api_type(ctx: EmitOpenAPIContext, stype: builder.SpecType) -> OpenAPITy
     ctx.namespaces.add(stype.namespace)
     # external namespace resolution
     return OpenAPIRefType(
-        source=f"{resolve_namespace_ref(ctx, stype.namespace)}/{stype.name}"
+        source=f"{resolve_namespace_ref(ctx, stype.namespace, config=config)}/{stype.name}"
     )

pkgs/type_spec/emit_open_api_util.py

@@ -9,6 +9,7 @@ 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"
@@ -74,9 +75,12 @@ class EmitOpenAPIContext:
 
 
 def resolve_namespace_ref(
-    ctx: EmitOpenAPIContext, namespace: builder.SpecNamespace
+    ctx: EmitOpenAPIContext,
+    namespace: builder.SpecNamespace,
+    *,
+    config: OpenAPIConfig,
 ) -> str:
     # TODO: Handle namespaces not in root directory
     if len(ctx.namespace.path) == 1:
         return f"{namespace.name}.yaml#/components/schema"
-    return f"/static/apidocs/common/{namespace.name}.yaml#/components/schema"
+    return f"{config.static_url_path}/common/{namespace.name}.yaml#/components/schema"

pkgs/type_spec/emit_python.py

@@ -372,11 +372,12 @@ def _emit_endpoint_invocation_function(
         arguments_type.properties is not None
         and len(arguments_type.properties.values()) > 0
     )
-
+    assert endpoint.function is not None
+    function_name = endpoint.function.split(".")[-1]
     ctx.out.write("\n")
     ctx.out.write(
         f"""
-    def {endpoint.path_basename}(
+    def {function_name}(
         self,\n"""
     )
     if has_arguments:

type_spec/external/api/entity/create_entities.yaml

@@ -5,24 +5,12 @@ $endpoint:
     function: main.site.app.external.entity.create_entities.create_entities
     desc: "Creates new Uncountable entities"
 
-EntityFieldInitialValue:
-    type: Object
-    properties:
-        field_ref_name:
-            type: String
-            desc: "A unique identifer string for the field"
-        row_index?:
-            type: Optional<Integer>
-            desc: "The index in the table for the field"
-        value:
-            type: JsonValue
-            desc: "The value for the field"
 
 EntityToCreate:
     type: Object
     properties:
         field_values?:
-            type: Optional<List<EntityFieldInitialValue>>
+            type: Optional<List<field_values.FieldRefNameValue>>
 
 Arguments:
     type: Object
@@ -31,25 +19,15 @@ Arguments:
             type: Integer
             desc: "Definition id for the entities to create"
         entity_type:
-            type: Union<Literal<'lab_request'>, Literal<'approval'>, Literal<'custom_entity'>, Literal<'task'>, Literal<'project'>>
+            type: Union<Literal<entity.EntityType.lab_request>, Literal<entity.EntityType.approval>, Literal<entity.EntityType.custom_entity>, Literal<entity.EntityType.task>, Literal<entity.EntityType.project>>
             desc: "The type of the entities to create"
         entities_to_create:
             type: List<EntityToCreate>
             desc: "A list of the entities to create"
 
-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"
-
 Data:
     type: Object
     properties:
         entities:
-            type: List<Entity>
+            type: List<entity.Entity>
             desc: The entities created

type_spec/external/api/entity/create_entity.yaml

@@ -26,24 +26,14 @@ Arguments:
             type: Integer
             desc: "Definition id of the entity to create"
         entity_type:
-            type: Union<Literal<'lab_request'>, Literal<'approval'>, Literal<'custom_entity'>, Literal<'task'>, Literal<'project'>>
+            type: Union<Literal<entity.EntityType.lab_request>, Literal<entity.EntityType.approval>, Literal<entity.EntityType.custom_entity>, Literal<entity.EntityType.task>, Literal<entity.EntityType.project>>
             desc: "The type of the entities requested"
         field_values?:
-            type: Optional<List<EntityFieldInitialValue>>
-
-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"
+            type: Optional<List<field_values.FieldRefNameValue>>
 
 Data:
     type: Object
     properties:
         entity:
-            type: Entity
+            type: entity.Entity
             desc: The entity created

type_spec/external/api/recipes/get_recipe_links.yaml

@@ -5,24 +5,6 @@ $endpoint:
     function: main.site.app.external.recipes.get_recipe_links.get_recipe_links
     desc: "Gets the links for the passed recipes"
 
-RecipeLinkType:
-    type: StringEnum
-    values:
-        user_link:
-            label: Manual Link
-        child:
-            label: "Test Sample"
-        self:
-            label: "Self Link"
-        recipe_as_output:
-            label: "Analytical Sample"
-        control:
-            label: "Control Link"
-        intermediate_recipe:
-            label: "Used as Component Link"
-        previous_experiment:
-            label: "Previous Sample"
-
 Arguments:
     type: Object
     properties:
@@ -34,28 +16,11 @@ Arguments:
             desc: "How many layers deep to look for links"
             default: 1
         link_types:
-            type: Optional<List<RecipeLinkType>>
+            type: Optional<List<recipe_links.RecipeLinkType>>
             desc: "Optional filter to only desired link types"
 
-RecipeLink:
-    type: Object
-    hashable: true
-    properties:
-        recipe_id_from:
-            type: Integer
-            desc: "Identifier for the recipe"
-        recipe_id_to:
-            type: Integer
-            desc: "Identifier for the calculation"
-        link_type:
-            type: String
-            desc: "The type of the link, e.g. child"
-        name:
-            type: String
-            desc: "The name used for the link.  Max 20"
-
 Data:
     type: Object
     properties:
         recipe_links:
-            type: List<RecipeLink>
+            type: List<recipe_links.RecipeLink>

uncountable/types/__init__.py

@@ -8,7 +8,9 @@ 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.recipes import create_recipes as create_recipes_t
+from . import entity as entity_t
 from .api.batch import execute_batch as execute_batch_t
+from . import field_values as field_values_t
 from .api.recipes import get_curve as get_curve_t
 from .api.entity import get_entities_data as get_entities_data_t
 from .api.inputs import get_input_data as get_input_data_t
@@ -26,6 +28,7 @@ from .api.recipes import get_recipe_names as get_recipe_names_t
 from .api.recipes import get_recipe_output_metadata as get_recipe_output_metadata_t
 from .api.recipes import get_recipes_data as get_recipes_data_t
 from .api.entity import list_entities as list_entities_t
+from . import recipe_links as recipe_links_t
 from .api.entity import resolve_entity_ids as resolve_entity_ids_t
 from .api.outputs import resolve_output_conditions as resolve_output_conditions_t
 from .api.inputs import set_input_attribute_values as set_input_attribute_values_t
@@ -40,7 +43,9 @@ __all__: list[str] = [
     "create_entity_t",
     "create_inputs_t",
     "create_recipes_t",
+    "entity_t",
     "execute_batch_t",
+    "field_values_t",
     "get_curve_t",
     "get_entities_data_t",
     "get_input_data_t",
@@ -58,6 +63,7 @@ __all__: list[str] = [
     "get_recipe_output_metadata_t",
     "get_recipes_data_t",
     "list_entities_t",
+    "recipe_links_t",
     "resolve_entity_ids_t",
     "resolve_output_conditions_t",
     "set_input_attribute_values_t",

uncountable/types/api/entity/create_entities.py

@@ -8,16 +8,14 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from pkgs.serialization import serial_class
-from ... import base as base_t
+from ... import entity as entity_t
+from ... import field_values as field_values_t
 
 __all__: list[str] = [
     "Arguments",
     "Data",
     "ENDPOINT_METHOD",
     "ENDPOINT_PATH",
-    "Entity",
-    "EntityFieldInitialValue",
     "EntityToCreate",
 ]
 
@@ -25,40 +23,22 @@ ENDPOINT_METHOD = "POST"
 ENDPOINT_PATH = "api/external/entity/external_create_entities"
 
 
-# DO NOT MODIFY -- This file is generated by type_spec
-@serial_class(
-    unconverted_values={"value"},
-)
-@dataclass(kw_only=True)
-class EntityFieldInitialValue:
-    field_ref_name: str
-    value: base_t.JsonValue
-    row_index: typing.Optional[typing.Optional[int]] = None
-
-
 # DO NOT MODIFY -- This file is generated by type_spec
 @dataclass(kw_only=True)
 class EntityToCreate:
-    field_values: typing.Optional[typing.Optional[list[EntityFieldInitialValue]]] = None
+    field_values: typing.Optional[typing.Optional[list[field_values_t.FieldRefNameValue]]] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
 @dataclass(kw_only=True)
 class Arguments:
     definition_id: int
-    entity_type: typing.Union[typing.Literal["lab_request"], typing.Literal["approval"], typing.Literal["custom_entity"], typing.Literal["task"], typing.Literal["project"]]
+    entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT]]
     entities_to_create: list[EntityToCreate]
 
 
-# DO NOT MODIFY -- This file is generated by type_spec
-@dataclass(kw_only=True)
-class Entity:
-    id: int
-    type: str
-
-
 # DO NOT MODIFY -- This file is generated by type_spec
 @dataclass(kw_only=True)
 class Data:
-    entities: list[Entity]
+    entities: list[entity_t.Entity]
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/create_entity.py

@@ -10,13 +10,14 @@ from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
 from pkgs.serialization import serial_class
 from ... import base as base_t
+from ... import entity as entity_t
+from ... import field_values as field_values_t
 
 __all__: list[str] = [
     "Arguments",
     "Data",
     "ENDPOINT_METHOD",
     "ENDPOINT_PATH",
-    "Entity",
     "EntityFieldInitialValue",
 ]
 
@@ -39,19 +40,12 @@ class EntityFieldInitialValue:
 @dataclass(kw_only=True)
 class Arguments:
     definition_id: int
-    entity_type: typing.Union[typing.Literal["lab_request"], typing.Literal["approval"], typing.Literal["custom_entity"], typing.Literal["task"], typing.Literal["project"]]
-    field_values: typing.Optional[typing.Optional[list[EntityFieldInitialValue]]] = None
-
-
-# DO NOT MODIFY -- This file is generated by type_spec
-@dataclass(kw_only=True)
-class Entity:
-    id: int
-    type: str
+    entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT]]
+    field_values: typing.Optional[typing.Optional[list[field_values_t.FieldRefNameValue]]] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
 @dataclass(kw_only=True)
 class Data:
-    entity: Entity
+    entity: entity_t.Entity
 # DO NOT MODIFY -- This file is generated by type_spec