GeneralManager 0.60.6__tar.gz → 0.62.0__tar.gz

{generalmanager-0.60.6/src/GeneralManager.egg-info → generalmanager-0.62.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.60.6
+Version: 0.62.0
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License
@@ -80,6 +80,11 @@ Provides-Extra: chat-anthropic
 Requires-Dist: anthropic>=0.34.0; extra == "chat-anthropic"
 Provides-Extra: chat-google
 Requires-Dist: google-genai>=1.0.0; extra == "chat-google"
+Provides-Extra: file-upload-image
+Requires-Dist: Pillow>=12.2.0; extra == "file-upload-image"
+Provides-Extra: file-upload-s3
+Requires-Dist: boto3>=1.42.0; extra == "file-upload-s3"
+Requires-Dist: django-storages[s3]>=1.14; extra == "file-upload-s3"
 Dynamic: license-file
 
 # GeneralManager

{generalmanager-0.60.6 → generalmanager-0.62.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.60.6"
+version = "0.62.0"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]
@@ -74,6 +74,8 @@ chat-ollama = ["ollama>=0.6.0"]
 chat-openai = ["openai>=1.0.0"]
 chat-anthropic = ["anthropic>=0.34.0"]
 chat-google = ["google-genai>=1.0.0"]
+file-upload-image = ["Pillow>=12.2.0"]
+file-upload-s3 = ["boto3>=1.42.0", "django-storages[s3]>=1.14"]
 
 [tool.setuptools]
 include-package-data = true

{generalmanager-0.60.6 → generalmanager-0.62.0/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.60.6
+Version: 0.62.0
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License
@@ -80,6 +80,11 @@ Provides-Extra: chat-anthropic
 Requires-Dist: anthropic>=0.34.0; extra == "chat-anthropic"
 Provides-Extra: chat-google
 Requires-Dist: google-genai>=1.0.0; extra == "chat-google"
+Provides-Extra: file-upload-image
+Requires-Dist: Pillow>=12.2.0; extra == "file-upload-image"
+Provides-Extra: file-upload-s3
+Requires-Dist: boto3>=1.42.0; extra == "file-upload-s3"
+Requires-Dist: django-storages[s3]>=1.14; extra == "file-upload-s3"
 Dynamic: license-file
 
 # GeneralManager

{generalmanager-0.60.6 → generalmanager-0.62.0}/src/GeneralManager.egg-info/SOURCES.txt

@@ -169,6 +169,7 @@ src/general_manager/interface/utils/database_interface_protocols.py
 src/general_manager/interface/utils/errors.py
 src/general_manager/interface/utils/models.py
 src/general_manager/management/commands/chat_cleanup.py
+src/general_manager/management/commands/cleanup_upload_intents.py
 src/general_manager/management/commands/graphql_warmup.py
 src/general_manager/management/commands/graphql_warmup_refresh_due.py
 src/general_manager/management/commands/search_index.py
@@ -194,6 +195,9 @@ src/general_manager/migrations/0004_chat_persistence_models.py
 src/general_manager/migrations/0004_search_index_state.py
 src/general_manager/migrations/0005_merge_chat_search.py
 src/general_manager/migrations/0006_chat_pending_confirmation_scoped_ids.py
+src/general_manager/migrations/0007_upload_intent.py
+src/general_manager/migrations/0008_upload_finalization_versions.py
+src/general_manager/migrations/0009_upload_cleanup_state.py
 src/general_manager/migrations/__init__.py
 src/general_manager/permission/__init__.py
 src/general_manager/permission/audit.py
@@ -225,6 +229,23 @@ src/general_manager/search/backends/opensearch.py
 src/general_manager/search/backends/typesense.py
 src/general_manager/seeding/__init__.py
 src/general_manager/seeding/manager_landscape.py
+src/general_manager/uploads/__init__.py
+src/general_manager/uploads/adapters.py
+src/general_manager/uploads/checks.py
+src/general_manager/uploads/config.py
+src/general_manager/uploads/errors.py
+src/general_manager/uploads/finalization.py
+src/general_manager/uploads/graphql.py
+src/general_manager/uploads/graphql_types.py
+src/general_manager/uploads/metrics.py
+src/general_manager/uploads/models.py
+src/general_manager/uploads/public.py
+src/general_manager/uploads/s3.py
+src/general_manager/uploads/services.py
+src/general_manager/uploads/tokens.py
+src/general_manager/uploads/types.py
+src/general_manager/uploads/urls.py
+src/general_manager/uploads/views.py
 src/general_manager/utils/__init__.py
 src/general_manager/utils/args_to_kwargs.py
 src/general_manager/utils/filter_parser.py

{generalmanager-0.60.6 → generalmanager-0.62.0}/src/GeneralManager.egg-info/requires.txt

@@ -38,3 +38,10 @@ ollama>=0.6.0
 
 [chat-openai]
 openai>=1.0.0
+
+[file-upload-image]
+Pillow>=12.2.0
+
+[file-upload-s3]
+boto3>=1.42.0
+django-storages[s3]>=1.14

generalmanager-0.62.0/src/general_manager/_types/api.py

@@ -0,0 +1,117 @@
+from __future__ import annotations
+
+"""Type-only imports for public API re-exports."""
+
+__all__ = [
+    "ClaimedObject",
+    "ExactPublicDownloadAdapter",
+    "FileContentInspector",
+    "FileInspection",
+    "FileUploadConfigurationError",
+    "FileUploadPolicy",
+    "GraphQL",
+    "GraphQLPropertyReturnAnnotationError",
+    "GraphQLPropertyTimeoutConfigurationError",
+    "GraphQLPropertyWarmUpConfigurationError",
+    "InvalidFileTypeError",
+    "InvalidImageError",
+    "InvalidUploadChecksumError",
+    "InvalidUploadFilenameError",
+    "InvalidUploadSizeError",
+    "MeasurementScalar",
+    "MeasurementType",
+    "ObjectVersion",
+    "ProxyUploadSink",
+    "RemoteInvalidationClient",
+    "StoredFile",
+    "StoredFileStatus",
+    "StoredImage",
+    "UploadAdapter",
+    "UploadAdapterFactory",
+    "UploadAlreadyConsumedError",
+    "UploadAuthenticationError",
+    "UploadBackendUnsupportedError",
+    "UploadBindingMismatchError",
+    "UploadChecksumMismatchError",
+    "UploadDatabaseMismatchError",
+    "UploadError",
+    "UploadExpiredError",
+    "UploadFieldInvalidError",
+    "UploadFinalizationAdapter",
+    "UploadFinalizationFailedError",
+    "UploadIncompleteError",
+    "UploadInstructions",
+    "UploadManagerInvalidError",
+    "UploadObjectMissingError",
+    "UploadOperationInvalidError",
+    "UploadQuotaExceededError",
+    "UploadRateLimitExceededError",
+    "UploadSizeMismatchError",
+    "UploadStorageChangedError",
+    "UploadStorageError",
+    "UploadSupersededError",
+    "UploadTargetUnavailableError",
+    "UploadToken",
+    "UploadTokenInvalidError",
+    "UploadTransferConflictError",
+    "UploadTransport",
+    "graph_ql_mutation",
+    "graph_ql_property",
+    "register_upload_adapter",
+]
+
+from general_manager.uploads.adapters import ClaimedObject
+from general_manager.uploads.adapters import ExactPublicDownloadAdapter
+from general_manager.uploads.config import FileContentInspector
+from general_manager.uploads.config import FileInspection
+from general_manager.uploads.config import FileUploadConfigurationError
+from general_manager.uploads.config import FileUploadPolicy
+from general_manager.api.graphql import GraphQL
+from general_manager.api.property import GraphQLPropertyReturnAnnotationError
+from general_manager.api.property import GraphQLPropertyTimeoutConfigurationError
+from general_manager.api.property import GraphQLPropertyWarmUpConfigurationError
+from general_manager.uploads.errors import InvalidFileTypeError
+from general_manager.uploads.errors import InvalidImageError
+from general_manager.uploads.errors import InvalidUploadChecksumError
+from general_manager.uploads.errors import InvalidUploadFilenameError
+from general_manager.uploads.errors import InvalidUploadSizeError
+from general_manager.api.graphql import MeasurementScalar
+from general_manager.api.graphql import MeasurementType
+from general_manager.uploads.types import ObjectVersion
+from general_manager.uploads.adapters import ProxyUploadSink
+from general_manager.api.remote_invalidation_client import RemoteInvalidationClient
+from general_manager.uploads.graphql_types import StoredFile
+from general_manager.uploads.types import StoredFileStatus
+from general_manager.uploads.graphql_types import StoredImage
+from general_manager.uploads.adapters import UploadAdapter
+from general_manager.uploads.adapters import UploadAdapterFactory
+from general_manager.uploads.errors import UploadAlreadyConsumedError
+from general_manager.uploads.errors import UploadAuthenticationError
+from general_manager.uploads.errors import UploadBackendUnsupportedError
+from general_manager.uploads.errors import UploadBindingMismatchError
+from general_manager.uploads.errors import UploadChecksumMismatchError
+from general_manager.uploads.errors import UploadDatabaseMismatchError
+from general_manager.uploads.errors import UploadError
+from general_manager.uploads.errors import UploadExpiredError
+from general_manager.uploads.errors import UploadFieldInvalidError
+from general_manager.uploads.adapters import UploadFinalizationAdapter
+from general_manager.uploads.errors import UploadFinalizationFailedError
+from general_manager.uploads.errors import UploadIncompleteError
+from general_manager.uploads.adapters import UploadInstructions
+from general_manager.uploads.errors import UploadManagerInvalidError
+from general_manager.uploads.errors import UploadObjectMissingError
+from general_manager.uploads.errors import UploadOperationInvalidError
+from general_manager.uploads.errors import UploadQuotaExceededError
+from general_manager.uploads.errors import UploadRateLimitExceededError
+from general_manager.uploads.errors import UploadSizeMismatchError
+from general_manager.uploads.errors import UploadStorageChangedError
+from general_manager.uploads.errors import UploadStorageError
+from general_manager.uploads.errors import UploadSupersededError
+from general_manager.uploads.errors import UploadTargetUnavailableError
+from general_manager.uploads.graphql_types import UploadToken
+from general_manager.uploads.errors import UploadTokenInvalidError
+from general_manager.uploads.errors import UploadTransferConflictError
+from general_manager.uploads.types import UploadTransport
+from general_manager.api.mutation import graph_ql_mutation
+from general_manager.api.property import graph_ql_property
+from general_manager.uploads.public import register_upload_adapter

{generalmanager-0.60.6 → generalmanager-0.62.0}/src/general_manager/api/graphql.py

@@ -49,6 +49,11 @@ from general_manager.permission.graphql_capabilities import (
     get_capability_context,
     get_graphql_capabilities,
 )
+from general_manager.uploads.graphql_types import (
+    StoredFile,
+    StoredImage,
+    create_stored_file_value,
+)
 from general_manager.utils.format_string import pascal_to_snake
 from general_manager.utils.type_checks import safe_issubclass
 
@@ -69,6 +74,7 @@ from general_manager.api.graphql_errors import (
     EXPECTED_MANAGER_ERRORS,  # noqa: F401  # re-exported
     SUSPICIOUS_MANAGER_ERRORS,  # noqa: F401  # re-exported
     HANDLED_MANAGER_ERRORS as HANDLED_MANAGER_ERRORS,
+    ValidationFieldNameMapper,
     MeasurementType as MeasurementType,
     MeasurementScalar as MeasurementScalar,
     PageInfo,
@@ -220,6 +226,14 @@ class GraphQL:
 
         clear_schema_index_cache()
 
+    @classmethod
+    def register_file_upload_mutation(cls) -> None:
+        """Register the generic begin-upload mutation when the feature is enabled."""
+
+        from general_manager.uploads.graphql import register_file_upload_mutation
+
+        register_file_upload_mutation(cls._mutations)
+
     @classmethod
     def get_registry_snapshot(cls) -> GraphQLRegistry:
         """
@@ -431,7 +445,31 @@ class GraphQL:
                 field_info,
             )
             resolver_name = f"resolve_{field_name}"
-            fields[resolver_name] = cls._create_resolver(field_name, field_type)
+            if field_info.get("orm_field_kind") in {"file", "image"}:
+
+                def resolve_stored_file(
+                    manager_instance: GeneralManager,
+                    info: GraphQLResolveInfo,
+                    *,
+                    _field_name: str = field_name,
+                    _manager_name: str = generalManagerClass.__name__,
+                ) -> object:
+                    if not cls._check_read_permission(
+                        manager_instance,
+                        info,
+                        _field_name,
+                    ):
+                        return None
+                    return create_stored_file_value(
+                        manager_instance,
+                        info,
+                        field_name=_field_name,
+                        manager_name=_manager_name,
+                    )
+
+                fields[resolver_name] = resolve_stored_file
+            else:
+                fields[resolver_name] = cls._create_resolver(field_name, field_type)
 
         # handle GraphQLProperty attributes
         for (
@@ -788,7 +826,9 @@ class GraphQL:
     ]:
         """Yield filter variants for *attribute_type*. See ``graphql_search.get_filter_options``."""
         return _get_filter_options_fn(
-            attribute_type, attribute_name, GraphQL._map_field_to_graphene_read
+            attribute_type,
+            attribute_name,
+            GraphQL._map_field_to_graphene_filter_input,
         )
 
     @staticmethod
@@ -801,10 +841,26 @@ class GraphQL:
         return _create_filter_options_fn(
             field_type,
             GraphQL.graphql_filter_type_registry,
-            GraphQL._map_field_to_graphene_read,
+            GraphQL._map_field_to_graphene_filter_input,
             relation_depth=relation_depth,
         )
 
+    @staticmethod
+    def _map_field_to_graphene_filter_input(
+        field_type: type,
+        field_name: str,
+        field_info: Mapping[str, object] | None = None,
+    ) -> object:
+        """Map file metadata to legacy string filters and delegate other fields."""
+        orm_field_kind = field_info.get("orm_field_kind") if field_info else None
+        if orm_field_kind in {"file", "image"}:
+            return graphene.String()
+        return GraphQL._map_field_to_graphene_read(
+            field_type,
+            field_name,
+            field_info,
+        )
+
     @staticmethod
     def _map_field_to_graphene_read(
         field_type: type,
@@ -864,6 +920,11 @@ class GraphQL:
                 lambda: GraphQL.graphql_type_registry[field_type.__name__]
             )
         else:
+            orm_field_kind = field_info.get("orm_field_kind") if field_info else None
+            if orm_field_kind == "file":
+                return graphene.Field(StoredFile)
+            if orm_field_kind == "image":
+                return graphene.Field(StoredImage)
             return GraphQL._map_field_to_graphene_base_type(
                 field_type,
                 field_info,
@@ -1512,9 +1573,13 @@ class GraphQL:
         )
 
     @staticmethod
-    def _handle_graph_ql_error(error: Exception) -> GraphQLError:
+    def _handle_graph_ql_error(
+        error: Exception,
+        *,
+        field_name_mapper: ValidationFieldNameMapper | None = None,
+    ) -> GraphQLError:
         """Thin wrapper - see :func:`general_manager.api.graphql_errors.handle_graph_ql_error`."""
-        return _handle_graph_ql_error_fn(error)
+        return _handle_graph_ql_error_fn(error, field_name_mapper=field_name_mapper)
 
     @classmethod
     def _handle_data_change(

{generalmanager-0.60.6 → generalmanager-0.62.0}/src/general_manager/api/graphql_errors.py

@@ -9,7 +9,7 @@ without introducing circular dependencies.
 
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Iterable, Mapping
 from dataclasses import dataclass
 from datetime import date, datetime
 from decimal import Decimal
@@ -17,7 +17,7 @@ from typing import TYPE_CHECKING, Protocol, TypeAlias, TypedDict, cast
 
 from graphql import GraphQLError
 from graphql.language import ast
-from django.core.exceptions import ValidationError
+from django.core.exceptions import NON_FIELD_ERRORS, ValidationError
 
 from general_manager.logging import get_logger
 from general_manager.measurement.measurement import Measurement
@@ -83,6 +83,8 @@ PermissionFilterPlan: TypeAlias = list[PermissionConstraint]
 ReadPermissionPlanMethod: TypeAlias = Callable[[], object]
 BigIntCoercible: TypeAlias = str | bytes | bytearray | int | float | Decimal
 GraphQLSubscriptionAction: TypeAlias = str
+ValidationFieldNameMapper: TypeAlias = Callable[[str], str]
+ValidationFieldErrors: TypeAlias = dict[str, list[str]]
 
 
 class _ReadPermissionProvider(Protocol):
@@ -438,30 +440,76 @@ def map_field_to_graphene_base_type(
         return String
 
 
-def handle_graph_ql_error(error: Exception) -> GraphQLError:
-    """Convert an exception into a GraphQL error with an extensions code.
+def _validation_messages_to_strings(messages: object) -> list[str]:
+    """Convert Django validation message values to plain strings."""
+    if isinstance(messages, ValidationError):
+        return [str(message) for message in messages.messages]
+    if isinstance(messages, str):
+        return [messages]
+    if isinstance(messages, bytes):
+        return [messages.decode()]
+    if isinstance(messages, Iterable):
+        return [str(message) for message in messages]
+    return [str(messages)]
+
+
+def _build_validation_error_extensions(
+    message_dict: Mapping[str, object],
+    *,
+    field_name_mapper: ValidationFieldNameMapper | None,
+) -> dict[str, object]:
+    """Convert validation messages into GraphQL BAD_USER_INPUT extensions.
+
+    Per-field keys are remapped with ``field_name_mapper`` when provided.
+    ``NON_FIELD_ERRORS`` messages are separated into ``nonFieldErrors`` and are
+    not remapped. The returned mapping always includes ``code``,
+    ``fieldErrors``, and ``nonFieldErrors`` keys.
+    """
+    field_errors: ValidationFieldErrors = {}
+    non_field_errors: list[str] = []
+
+    for field_name, messages in message_dict.items():
+        message_list = _validation_messages_to_strings(messages)
+        if field_name == NON_FIELD_ERRORS:
+            non_field_errors.extend(message_list)
+            continue
+
+        schema_field_name = (
+            field_name_mapper(field_name)
+            if field_name_mapper is not None
+            else field_name
+        )
+        field_errors.setdefault(schema_field_name, []).extend(message_list)
+
+    return {
+        "code": "BAD_USER_INPUT",
+        "fieldErrors": field_errors,
+        "nonFieldErrors": non_field_errors,
+    }
+
+
+def handle_graph_ql_error(
+    error: Exception,
+    *,
+    field_name_mapper: ValidationFieldNameMapper | None = None,
+) -> GraphQLError:
+    """Convert a handled exception into a GraphQL error.
 
     This private extracted helper is used by the canonical GraphQL module and is
     not a stable import path. The behavior documented here is a
     generated-resolver compatibility note, not a stable direct-import guarantee.
 
     Explicit ``GraphQLError`` instances are returned as the same object,
-    preserving their message and entire existing ``extensions`` mapping. For
-    converted exceptions, the returned ``GraphQLError.extensions`` mapping
-    contains a single ``"code"`` key. The original exception message is
-    intentionally exposed as the GraphQL error message; this is a stable
-    generated-response compatibility guarantee for
-    ``{"code": "INTERNAL_SERVER_ERROR"}`` responses as well as user-error
-    responses, even though the helper itself remains a private import.
-    ``PermissionError`` uses ``{"code": "PERMISSION_DENIED"}`` and is
-    logged at info level. ``ValueError`` and Django ``ValidationError`` use
-    ``{"code": "BAD_USER_INPUT"}`` and are logged as warnings. ``TypeError``,
-    ``AttributeError``, and ``RuntimeError`` are treated as suspicious handled
-    errors, logged with traceback information, and returned as
-    ``{"code": "INTERNAL_SERVER_ERROR"}``. Exceptions outside those explicit
-    branches are logged as unexpected internal errors and also returned as
-    ``INTERNAL_SERVER_ERROR``. Logging level/category is diagnostic behavior of
-    the internal ``api.graphql`` logger and is not a public API contract.
+    preserving their message and existing ``extensions`` mapping. Converted
+    exceptions always include an ``extensions["code"]`` value. Django
+    ``ValidationError`` instances with ``message_dict`` use
+    ``"Validation failed."`` with ``BAD_USER_INPUT`` plus ``fieldErrors`` and
+    ``nonFieldErrors``. When ``field_name_mapper`` is provided, it maps
+    ``message_dict`` field keys before they are emitted in ``fieldErrors``;
+    non-field errors are not mapped. Other converted exceptions keep their
+    original message and category-specific code. Logging level/category is
+    diagnostic behavior of the internal ``api.graphql`` logger and is not a
+    public API contract.
     """
     message = str(error)
     error_name = type(error).__name__
@@ -477,7 +525,21 @@ def handle_graph_ql_error(error: Exception) -> GraphQLError:
             context={"error": error_name, "message": message},
         )
         return GraphQLError(message, extensions={"code": "PERMISSION_DENIED"})
-    elif isinstance(error, (ValueError, ValidationError)):
+    elif isinstance(error, ValidationError):
+        logger.warning(
+            "graphql user error",
+            context={"error": error_name, "message": message},
+        )
+        if hasattr(error, "error_dict"):
+            return GraphQLError(
+                "Validation failed.",
+                extensions=_build_validation_error_extensions(
+                    error.message_dict,
+                    field_name_mapper=field_name_mapper,
+                ),
+            )
+        return GraphQLError(message, extensions={"code": "BAD_USER_INPUT"})
+    elif isinstance(error, ValueError):
         logger.warning(
             "graphql user error",
             context={"error": error_name, "message": message},