UncountablePythonSDK 0.0.86__tar.gz → 0.0.88__tar.gz

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/.github/workflows/documentation.yml

@@ -9,7 +9,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
       - uses: extractions/setup-crate@4993624604c307fbca528d28a3c8b60fa5ecc859 # v1
         with:

{uncountablepythonsdk-0.0.86/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.86
+Version: 0.0.88
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -37,6 +37,7 @@ Requires-Dist: flask==3.*
 Requires-Dist: simplejson==3.*
 Requires-Dist: grpcio==1.67.1
 Requires-Dist: protobuf>=4.21.1
+Requires-Dist: azure-storage-blob==12.*
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.86
+Version: 0.0.88
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -37,6 +37,7 @@ Requires-Dist: flask==3.*
 Requires-Dist: simplejson==3.*
 Requires-Dist: grpcio==1.67.1
 Requires-Dist: protobuf>=4.21.1
+Requires-Dist: azure-storage-blob==12.*
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ pkgs/argument_parser/_is_namedtuple.py
 pkgs/argument_parser/argument_parser.py
 pkgs/argument_parser/case_convert.py
 pkgs/filesystem_utils/__init__.py
+pkgs/filesystem_utils/_blob_session.py
 pkgs/filesystem_utils/_gdrive_session.py
 pkgs/filesystem_utils/_local_session.py
 pkgs/filesystem_utils/_s3_session.py
@@ -228,6 +229,7 @@ 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
+uncountable/types/api/entity/set_entity_values.py
 uncountable/types/api/entity/set_values.py
 uncountable/types/api/entity/transition_entity_phase.py
 uncountable/types/api/entity/unlock_entity.py

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/UncountablePythonSDK.egg-info/requires.txt

@@ -19,6 +19,7 @@ flask==3.*
 simplejson==3.*
 grpcio==1.67.1
 protobuf>=4.21.1
+azure-storage-blob==12.*
 
 [test]
 mypy==1.*

uncountablepythonsdk-0.0.88/pkgs/filesystem_utils/_blob_session.py

@@ -0,0 +1,137 @@
+from io import BytesIO
+
+from azure.storage.blob import BlobServiceClient, ContainerClient
+
+from pkgs.filesystem_utils.file_type_utils import (
+    FileObjectData,
+    FileSystemBlobConfig,
+    FileSystemFileReference,
+    FileSystemObject,
+    FileTransfer,
+    IncompatibleFileReference,
+)
+
+from .filesystem_session import FileSystemSession
+
+
+def _add_slash(prefix: str) -> str:
+    if len(prefix) > 0 and prefix[-1] != "/":
+        prefix = prefix + "/"
+    return prefix
+
+
+class BlobSession(FileSystemSession):
+    config: FileSystemBlobConfig
+
+    def __init__(self, blob_config: FileSystemBlobConfig) -> None:
+        super().__init__()
+        self.config = blob_config
+
+    def start(self) -> None:
+        self.service_client: BlobServiceClient | None = BlobServiceClient(
+            self.config.account_url, credential=self.config.credential
+        )
+        self.container_client: ContainerClient | None = (
+            self.service_client.get_container_client(self.config.container)
+        )
+
+    def __enter__(self) -> "BlobSession":
+        self.start()
+        return self
+
+    def __exit__(self, exc_type: object, exc_val: object, exc_tb: object) -> None:
+        self.service_client = None
+        self.container_client = None
+
+    def list_files(
+        self,
+        dir_path: FileSystemObject,
+        *,
+        recursive: bool = False,
+        valid_extensions: list[str] | None = None,
+    ) -> list[FileSystemObject]:
+        if not isinstance(dir_path, FileSystemFileReference):
+            raise IncompatibleFileReference()
+
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to list_files on uninitialized blob session"
+        )
+
+        filesystem_file_references: list[FileSystemObject] = []
+        prefix = _add_slash(dir_path.filepath)
+        for blob in self.container_client.list_blobs(name_starts_with=prefix):
+            if not recursive and (
+                blob.name == prefix or "/" in blob.name[len(prefix) :]
+            ):
+                continue
+            if valid_extensions is None or any(
+                blob.name.endswith(valid_extension)
+                for valid_extension in valid_extensions
+            ):
+                filesystem_file_references.append(
+                    FileSystemFileReference(
+                        filepath=blob.name,
+                    )
+                )
+
+        return filesystem_file_references
+
+    def download_files(
+        self,
+        filepaths: list[FileSystemObject],
+    ) -> list[FileObjectData]:
+        downloaded_files: list[FileObjectData] = []
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to download_files on uninitialized blob session"
+        )
+
+        for file_object in filepaths:
+            if (
+                not isinstance(file_object, FileSystemFileReference)
+                or file_object.filename is None
+            ):
+                raise IncompatibleFileReference()
+
+            blob_client = self.container_client.get_blob_client(file_object.filepath)
+            download_stream = blob_client.download_blob()
+            file_data = download_stream.readall()
+            downloaded_files.append(
+                FileObjectData(
+                    file_data=file_data,
+                    file_IO=BytesIO(file_data),
+                    filename=file_object.filename,
+                    filepath=file_object.filepath,
+                )
+            )
+
+        return downloaded_files
+
+    def move_files(self, file_mappings: list[FileTransfer]) -> None:
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to move_files on uninitialized blob session"
+        )
+
+        for src_file, dest_file in file_mappings:
+            if not isinstance(src_file, FileSystemFileReference) or not isinstance(
+                dest_file, FileSystemFileReference
+            ):
+                raise IncompatibleFileReference()
+
+            source_blob_client = self.container_client.get_blob_client(
+                src_file.filepath
+            )
+            dest_blob_client = self.container_client.get_blob_client(dest_file.filepath)
+
+            dest_blob_client.start_copy_from_url(source_blob_client.url)
+            source_blob_client.delete_blob()
+
+    def delete_files(self, filepaths: list[FileSystemObject]) -> None:
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to delete_files on uninitialized blob session"
+        )
+        for file_object in filepaths:
+            if not isinstance(file_object, FileSystemFileReference):
+                raise IncompatibleFileReference()
+
+            blob_client = self.container_client.get_blob_client(file_object.filepath)
+            blob_client.delete_blob()

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/pkgs/filesystem_utils/file_type_utils.py

@@ -4,6 +4,12 @@ from io import BytesIO
 from typing import Optional, Union
 
 import paramiko
+from azure.core.credentials import (
+    AzureNamedKeyCredential,
+    AzureSasCredential,
+    TokenCredential,
+)
+from azure.storage.blob import ContainerProperties
 
 
 @dataclass
@@ -69,3 +75,17 @@ class FileSystemS3Config:
     access_key_id: Optional[str]
     secret_access_key: Optional[str]
     session_token: Optional[str]
+
+
+@dataclass(kw_only=True)
+class FileSystemBlobConfig:
+    account_url: str
+    credential: (
+        str
+        | dict[str, str]
+        | AzureNamedKeyCredential
+        | AzureSasCredential
+        | TokenCredential
+        | None
+    )
+    container: ContainerProperties | str

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/pkgs/serialization/opaque_key.py

@@ -1,4 +1,4 @@
 # Blocks a string key value from being interpreted for case conversion
-class OpaqueKey(str):
+class OpaqueKey(str):  # noqa: FURB189
     def __new__(cls, key: str) -> "OpaqueKey":
         return str.__new__(cls, key)

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/pkgs/type_spec/emit_python.py

@@ -1148,13 +1148,15 @@ def _create_api_function(
 
     ruff_requires_wrap = len(endpoint.path_basename) > 14
 
+    account_type = endpoint.root if endpoint.root != "external" else "materials"
+
     api_out.write(
         f"""import {api_import} as api
 from main.db.session import Session, SessionMaker
 from main.site.decorators import APIError, APIResponse, {validated_method}
 
 
-@{validated_method}(api.ENDPOINT_PATH, "{endpoint.root}", api.Arguments)
+@{validated_method}(api.ENDPOINT_PATH, "{account_type}", api.Arguments)
 def {endpoint.path_basename}({WRAP_ARGS_START if ruff_requires_wrap else ""}args: api.Arguments, client_sm: SessionMaker{WRAP_ARGS_END if ruff_requires_wrap else ""}) -> APIResponse[api.Data]:
     with Session(client_sm) as session:
         # return APIResponse(data=api.Data())

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/pkgs/type_spec/emit_typescript_util.py

@@ -82,9 +82,11 @@ def emit_value_ts(
             return (
                 "{\n\t"
                 + ",\n\t".join(
-                    "["
-                    + emit_value_ts(ctx, key_type, dkey)
-                    + "]: "
+                    (
+                        f"[{emit_value_ts(ctx, key_type, dkey)}]: "
+                        if not key_type.is_base_type(builder.BaseTypeName.s_string)
+                        else f"{dkey}: "
+                    )
                     + emit_value_ts(ctx, value_type, dvalue)
                     for dkey, dvalue in value.items()
                 )

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/pyproject.toml

@@ -61,15 +61,16 @@ dependencies = [
     "tqdm == 4.*",
     "pysftp == 0.*",
     "opentelemetry-api==1.*",
-    "opentelemetry-exporter-otlp-proto-common==1.*", 
-    "opentelemetry-exporter-otlp-proto-http==1.*", 
+    "opentelemetry-exporter-otlp-proto-common==1.*",
+    "opentelemetry-exporter-otlp-proto-http==1.*",
     "opentelemetry-sdk==1.*",
     "paramiko == 3.*",
     "boto3 == 1.*",
     "flask == 3.*",
     "simplejson == 3.*",
     "grpcio == 1.67.1",
-    "protobuf >= 4.21.1"
+    "protobuf >= 4.21.1",
+    "azure-storage-blob == 12.*"
 ]
 dynamic = ["version"]
 

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/core/client.py

@@ -71,16 +71,24 @@ class APIResponseError(Exception):
     extra_details: dict[str, JsonValue] | None
 
     def __init__(
-        self, status_code: int, message: str, extra_details: dict[str, JsonValue] | None
+        self,
+        status_code: int,
+        message: str,
+        extra_details: dict[str, JsonValue] | None,
+        request_id: str,
     ) -> None:
         super().__init__(status_code, message, extra_details)
         self.status_code = status_code
         self.message = message
         self.extra_details = extra_details
+        self.request_id = request_id
 
     @classmethod
     def construct_error(
-        cls, status_code: int, extra_details: dict[str, JsonValue] | None
+        cls,
+        status_code: int,
+        extra_details: dict[str, JsonValue] | None,
+        request_id: str,
     ) -> "APIResponseError":
         message: str
         match status_code:
@@ -103,9 +111,21 @@ class APIResponseError(Exception):
             case _:
                 message = "unknown error"
         return APIResponseError(
-            status_code=status_code, message=message, extra_details=extra_details
+            status_code=status_code,
+            message=message,
+            extra_details=extra_details,
+            request_id=request_id,
         )
 
+    def __str__(self) -> str:
+        details_obj = {
+            "request_id": self.request_id,
+            "status_code": self.status_code,
+            "extra_details": self.extra_details,
+        }
+        details = json.dumps(details_obj)
+        return f"API response error ({self.status_code}): '{self.message}'. Details: {details}"
+
 
 class SDKError(Exception):
     message: str
@@ -174,7 +194,9 @@ class Client(ClientMethods):
             except JSONDecodeError:
                 pass
             raise APIResponseError.construct_error(
-                status_code=response.status_code, extra_details=extra_details
+                status_code=response.status_code,
+                extra_details=extra_details,
+                request_id=request_id,
             )
         try:
             return typing.cast(dict[str, JsonValue], response.json())

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/integration/queue_runner/job_scheduler.py

@@ -106,7 +106,10 @@ async def start_scheduler(command_queue: CommandQueue) -> None:
         ) -> str:
             if isinstance(
                 payload.invocation_context,
-                queued_job_t.InvocationContextCron,
+                (
+                    queued_job_t.InvocationContextCron,
+                    queued_job_t.InvocationContextManual,
+                ),
             ):
                 existing_queued_jobs = datastore.load_job_queue()
                 duplicate_job = next(

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/types/__init__.py

@@ -85,6 +85,7 @@ from . import response_t as response_t
 from .api.triggers import run_trigger as run_trigger_t
 from . import secret_retrieval_t as secret_retrieval_t
 from .api.permissions import set_core_permissions as set_core_permissions_t
+from .api.entity import set_entity_values as set_entity_values_t
 from .api.inputs import set_input_attribute_values as set_input_attribute_values_t
 from .api.inputs import set_input_category as set_input_category_t
 from .api.inputs import set_input_subcategories as set_input_subcategories_t
@@ -191,6 +192,7 @@ __all__: list[str] = [
     "run_trigger_t",
     "secret_retrieval_t",
     "set_core_permissions_t",
+    "set_entity_values_t",
     "set_input_attribute_values_t",
     "set_input_category_t",
     "set_input_subcategories_t",

uncountablepythonsdk-0.0.88/uncountable/types/api/entity/set_entity_values.py

@@ -0,0 +1,44 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# flake8: noqa: F821
+# 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
+
+__all__: list[str] = [
+    "Arguments",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+]
+
+ENDPOINT_METHOD = "POST"
+ENDPOINT_PATH = "api/external/entity/set_entity_values"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.set_entity_values.Arguments",
+)
+@dataclasses.dataclass(kw_only=True)
+class Arguments:
+    entity_identifier: entity_t.EntityIdentifier
+    field_values: list[field_values_t.FieldArgumentValue]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.set_entity_values.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.86 → uncountablepythonsdk-0.0.88}/uncountable/types/async_batch.py

@@ -6,6 +6,7 @@
 # Kept only for SDK backwards compatibility
 from .async_batch_t import AsyncBatchRequestPath as AsyncBatchRequestPath
 from .async_batch_t import AsyncBatchRequest as AsyncBatchRequest
+from .async_batch_t import AsyncBatchResultValue as AsyncBatchResultValue
 from .async_batch_t import AsyncBatchActionReturn as AsyncBatchActionReturn
 from .async_batch_t import SavedAsyncBatchActionReturn as SavedAsyncBatchActionReturn
 from .async_batch_t import QueuedAsyncBatchRequest as QueuedAsyncBatchRequest

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/types/async_batch_processor.py

@@ -16,6 +16,7 @@ import uncountable.types.api.recipes.clear_recipe_outputs as clear_recipe_output
 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
+from uncountable.types import field_values_t
 from uncountable.types import generic_upload_t
 import uncountable.types.api.entity.grant_entity_permissions as grant_entity_permissions_t
 from uncountable.types import identifier_t
@@ -23,6 +24,7 @@ import uncountable.types.api.uploader.invoke_uploader as invoke_uploader_t
 from uncountable.types import recipe_identifiers_t
 from uncountable.types import recipe_metadata_t
 from uncountable.types import recipe_workflow_steps_t
+import uncountable.types.api.entity.set_entity_values as set_entity_values_t
 import uncountable.types.api.recipes.set_recipe_metadata as set_recipe_metadata_t
 import uuid
 from abc import ABC, abstractmethod
@@ -311,6 +313,41 @@ class AsyncBatchProcessorBase(ABC):
             batch_reference=req.batch_reference,
         )
 
+    def set_entity_values(
+        self,
+        *,
+        entity_identifier: entity_t.EntityIdentifier,
+        field_values: list[field_values_t.FieldArgumentValue],
+        depends_on: typing.Optional[list[str]] = None,
+    ) -> async_batch_t.QueuedAsyncBatchRequest:
+        """Sets field values for an entity
+
+        :param entity_identifier: Entity to update
+        :param field_values: Field values to set
+        :param depends_on: A list of batch reference keys to process before processing this request
+        """
+        args = set_entity_values_t.Arguments(
+            entity_identifier=entity_identifier,
+            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.SET_ENTITY_VALUES,
+            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 set_recipe_metadata(
         self,
         *,

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/types/async_batch_t.py

@@ -11,11 +11,13 @@ from pkgs.strenum_compat import StrEnum
 import dataclasses
 from pkgs.serialization import serial_class
 from . import base_t
+from . import entity_t
 
 __all__: list[str] = [
     "AsyncBatchActionReturn",
     "AsyncBatchRequest",
     "AsyncBatchRequestPath",
+    "AsyncBatchResultValue",
     "QueuedAsyncBatchRequest",
     "SavedAsyncBatchActionReturn",
 ]
@@ -35,6 +37,7 @@ class AsyncBatchRequestPath(StrEnum):
     ASSOCIATE_RECIPE_AS_INPUT = "recipes/associate_recipe_as_input"
     CLEAR_RECIPE_OUTPUTS = "recipes/clear_recipe_outputs"
     GRANT_ENTITY_PERMISSIONS = "entity/grant_entity_permissions"
+    SET_ENTITY_VALUES = "entity/set_entity_values"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -50,6 +53,17 @@ class AsyncBatchRequest:
     depends_on: typing.Optional[list[str]] = None
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.async_batch.AsyncBatchResultValue",
+    unconverted_values={"value"},
+)
+@dataclasses.dataclass(kw_only=True)
+class AsyncBatchResultValue:
+    data_key: str
+    value: base_t.JsonValue
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     named_type_path="sdk.async_batch.AsyncBatchActionReturn",
@@ -58,6 +72,8 @@ class AsyncBatchRequest:
 class AsyncBatchActionReturn:
     modification_made: bool
     result_id: typing.Optional[base_t.ObjectId] = None
+    entity: typing.Optional[entity_t.Entity] = None
+    result_values: typing.Optional[list[AsyncBatchResultValue]] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/types/client_base.py

@@ -69,6 +69,7 @@ import uncountable.types.api.entity.resolve_entity_ids as resolve_entity_ids_t
 import uncountable.types.api.outputs.resolve_output_conditions as resolve_output_conditions_t
 import uncountable.types.api.triggers.run_trigger as run_trigger_t
 import uncountable.types.api.permissions.set_core_permissions as set_core_permissions_t
+import uncountable.types.api.entity.set_entity_values as set_entity_values_t
 import uncountable.types.api.inputs.set_input_attribute_values as set_input_attribute_values_t
 import uncountable.types.api.inputs.set_input_category as set_input_category_t
 import uncountable.types.api.inputs.set_input_subcategories as set_input_subcategories_t
@@ -1232,6 +1233,28 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=set_core_permissions_t.Data)
 
+    def set_entity_values(
+        self,
+        *,
+        entity_identifier: entity_t.EntityIdentifier,
+        field_values: list[field_values_t.FieldArgumentValue],
+    ) -> set_entity_values_t.Data:
+        """Sets field values for an entity
+
+        :param entity_identifier: Entity to update
+        :param field_values: Field values to set
+        """
+        args = set_entity_values_t.Arguments(
+            entity_identifier=entity_identifier,
+            field_values=field_values,
+        )
+        api_request = APIRequest(
+            method=set_entity_values_t.ENDPOINT_METHOD,
+            endpoint=set_entity_values_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=set_entity_values_t.Data)
+
     def set_input_attribute_values(
         self,
         *,

{uncountablepythonsdk-0.0.86 → uncountablepythonsdk-0.0.88}/uncountable/types/entity.py

@@ -9,4 +9,5 @@ from .entity_t import LimitedEntityType as LimitedEntityType
 from .entity_t import EntityPermissionType as EntityPermissionType
 from .entity_t import GrantableEntityPermissionType as GrantableEntityPermissionType
 from .entity_t import Entity as Entity
+from .entity_t import EntityIdentifier as EntityIdentifier
 # DO NOT MODIFY -- This file is generated by type_spec