mainsequence 4.2.39__tar.gz → 4.2.40__tar.gz

{mainsequence-4.2.39/mainsequence.egg-info → mainsequence-4.2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 4.2.39
+Version: 4.2.40
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License: MainSequence GmbH SDK License Agreement

{mainsequence-4.2.39 → mainsequence-4.2.40}/agent_scaffold/skills/data_publishing/meta_tables/SKILL.md

@@ -137,7 +137,11 @@ first version, use Alembic. Keep the SDK model as a normal
 `PlatformManagedMetaTable` or `PlatformTimeIndexMetaData` catalog contract, and
 apply physical schema changes through the Alembic migration workflow.
 
-Schema must come from SQLAlchemy table metadata, usually `__table_args__ = {"schema": "public"}` or the tuple form ending in `{"schema": ...}`. Do not add a separate MetaTable-specific schema attribute.
+Default-schema tables must leave SQLAlchemy `Table.schema` unset; do not write
+`__table_args__ = {"schema": "public"}` for the default PostgreSQL schema. Set
+schema metadata only for non-default schemas, using `__table_args__ = {"schema":
+"custom_schema"}` or the tuple form ending in `{"schema": ...}`. Do not add a
+separate MetaTable-specific schema attribute.
 
 Always declare `__metatable_description__` on the model. The description must
 explain the table's business intention, row grain, and expected use, not only
@@ -246,7 +250,7 @@ Use this pattern:
 ```python
 account_uid: Mapped[uuid.UUID] = mapped_column(
     Uuid,
-    ForeignKey("public.sdk_examples__account.uid", ondelete="RESTRICT"),
+    ForeignKey("sdk_examples__account.uid", ondelete="RESTRICT"),
     nullable=False,
 )
 ```

{mainsequence-4.2.39 → mainsequence-4.2.40}/mainsequence/meta_tables/migrations.py

@@ -27,9 +27,14 @@ from mainsequence.meta_tables.hashing import build_meta_table_storage_hash
 from mainsequence.meta_tables.sqlalchemy_contracts import (
     PlatformManagedMetaTable,
     PlatformTimeIndexMetaData,
+    _ensure_time_index_unique_grain_index,
+    _normalize_table_default_schema,
     _resolve_model_data_source_uid,
     _resolve_table,
+    _resolve_time_index_name,
+    _resolve_time_index_names,
     _table_name,
+    _validate_time_index_contract,
     platform_managed_migration_registration_context,
 )
 
@@ -268,6 +273,8 @@ class AlembicMetaTableMigration:
             self.after_register_metatables
         ):
             raise TypeError("after_register_metatables must be callable when provided.")
+        _normalize_provider_default_schemas(self.metatable_models)
+        _ensure_provider_time_index_grain_indexes(self.metatable_models)
 
     @property
     def alembic_version_table(self) -> str:
@@ -956,6 +963,27 @@ def _metadata_table_names(target_metadata: Any) -> list[str]:
     return list(dict.fromkeys(names))
 
 
+def _normalize_provider_default_schemas(models: Sequence[type[Any]]) -> None:
+    for model in models:
+        if _is_platform_managed_metatable_model(model):
+            _normalize_table_default_schema(_resolve_table(model))
+
+
+def _ensure_provider_time_index_grain_indexes(models: Sequence[type[Any]]) -> None:
+    for model in models:
+        if not _is_platform_time_index_metatable_model(model):
+            continue
+        table = _resolve_table(model)
+        time_index_name = _resolve_time_index_name(model)
+        index_names = _resolve_time_index_names(model, time_index_name=time_index_name)
+        _validate_time_index_contract(
+            columns=list(table.columns),
+            time_index_name=time_index_name,
+            index_names=index_names,
+        )
+        _ensure_time_index_unique_grain_index(table=table, index_names=index_names)
+
+
 def _normalize_down_revision(value: Any) -> str | None:
     if value in (None, ""):
         return None

{mainsequence-4.2.39 → mainsequence-4.2.40}/mainsequence/meta_tables/sqlalchemy_contracts.py

@@ -11,6 +11,7 @@ from uuid import UUID
 from sqlalchemy import Table as _SQLAlchemyTable
 from sqlalchemy import inspect as _sqlalchemy_inspect
 from sqlalchemy.orm import declared_attr as _sqlalchemy_declared_attr
+from sqlalchemy.schema import BLANK_SCHEMA as _SQLALCHEMY_BLANK_SCHEMA
 
 from mainsequence.client.dtype_codec import (
     is_temporal_token,
@@ -35,6 +36,7 @@ DEFAULT_PLATFORM_MANAGED_PROVISIONING = {
     "if_not_exists": True,
 }
 SERVER_GENERATED_UUID_DEFAULT = "gen_random_uuid()"
+DEFAULT_POSTGRES_SCHEMA = "public"
 _PLATFORM_MANAGED_MIGRATION_REGISTRATION_CONTEXT: contextvars.ContextVar[bool] = (
     contextvars.ContextVar(
         "mainsequence_platform_managed_migration_registration_context",
@@ -153,8 +155,14 @@ class PlatformManagedMetaTable:
 
         name, metadata, *table_items = args
         kwargs = dict(kwargs)
-        schema = str(kwargs.get("schema") or _resolve_class_schema(cls, metadata=metadata))
-        if not kwargs.get("schema"):
+        schema = _normalize_sqlalchemy_schema(
+            kwargs.get("schema")
+            if "schema" in kwargs
+            else _resolve_class_schema(cls, metadata=metadata)
+        )
+        if schema is None:
+            kwargs["schema"] = _SQLALCHEMY_BLANK_SCHEMA
+        else:
             kwargs["schema"] = schema
 
         from sqlalchemy import Table
@@ -308,8 +316,14 @@ class PlatformTimeIndexMetaData(PlatformManagedMetaTable):
 
         name, metadata, *table_items = args
         kwargs = dict(kwargs)
-        schema = str(kwargs.get("schema") or _resolve_class_schema(cls, metadata=metadata))
-        if not kwargs.get("schema"):
+        schema = _normalize_sqlalchemy_schema(
+            kwargs.get("schema")
+            if "schema" in kwargs
+            else _resolve_class_schema(cls, metadata=metadata)
+        )
+        if schema is None:
+            kwargs["schema"] = _SQLALCHEMY_BLANK_SCHEMA
+        else:
             kwargs["schema"] = schema
 
         columns = [item for item in table_items if _looks_like_column(item)]
@@ -416,7 +430,7 @@ def table_contract_from_sqlalchemy_model(
     include_physical_table_name: bool = True,
 ) -> MetaTableContract:
     table = _resolve_table(model_or_table)
-    _resolve_schema(table, schema=schema)
+    resolved_schema = _resolve_schema(table, schema=schema)
     module, qualname = _resolve_model_path(
         model_or_table,
         table_model_module=table_model_module,
@@ -433,6 +447,7 @@ def table_contract_from_sqlalchemy_model(
             }
         },
         physical=MetaTablePhysicalContract(
+            schema_=resolved_schema,
             table_name=_table_name(table) if include_physical_table_name else None,
         ),
         columns=[
@@ -563,7 +578,10 @@ def time_indexed_registration_request_from_sqlalchemy_model(
                     ),
                 },
             },
-            "physical": {"table_name": _table_name(table)},
+            "physical": {
+                "schema": resolved_schema,
+                "table_name": _table_name(table),
+            },
             "columns": column_contracts,
         },
     )
@@ -744,7 +762,7 @@ def _table_name(table: Any) -> str:
 def _resolve_schema(table: Any, *, schema: str | None = None) -> str:
     resolved_schema = schema or getattr(table, "schema", None)
     if not resolved_schema:
-        raise ValueError("MetaTable SQLAlchemy contracts require a SQLAlchemy table schema.")
+        return DEFAULT_POSTGRES_SCHEMA
     return str(resolved_schema)
 
 
@@ -755,7 +773,7 @@ def _resolve_class_namespace(cls: type[Any]) -> str:
     return str(resolved_namespace)
 
 
-def _resolve_class_schema(cls: type[Any], *, metadata: Any | None = None) -> str:
+def _resolve_class_schema(cls: type[Any], *, metadata: Any | None = None) -> str | None:
     table_args = getattr(cls, "__table_args__", None)
     if isinstance(table_args, Mapping):
         schema = table_args.get("schema")
@@ -765,7 +783,29 @@ def _resolve_class_schema(cls: type[Any], *, metadata: Any | None = None) -> str
         schema = None
     if schema is None and metadata is not None:
         schema = getattr(metadata, "schema", None)
-    return str(schema or "public")
+    return _normalize_sqlalchemy_schema(schema)
+
+
+def _normalize_sqlalchemy_schema(schema: Any | None) -> str | None:
+    if schema is None:
+        return None
+    schema_name = str(schema).strip()
+    if schema_name in ("", DEFAULT_POSTGRES_SCHEMA):
+        return None
+    return schema_name
+
+
+def _normalize_table_default_schema(table: Any) -> None:
+    if getattr(table, "schema", None) != DEFAULT_POSTGRES_SCHEMA:
+        return
+
+    metadata = getattr(table, "metadata", None)
+    if metadata is not None:
+        metadata._remove_table(table.name, table.schema)
+    table.schema = None
+    table.fullname = _table_name(table)
+    if metadata is not None:
+        metadata._add_table(table.name, table.schema, table)
 
 
 def _resolve_data_source_uid(

{mainsequence-4.2.39 → mainsequence-4.2.40/mainsequence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 4.2.39
+Version: 4.2.40
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License: MainSequence GmbH SDK License Agreement

{mainsequence-4.2.39 → mainsequence-4.2.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mainsequence"
-version = "4.2.39"
+version = "4.2.40"
 description = "Main Sequence SDK "
 readme = "README.md"
 requires-python = ">=3.11"

{mainsequence-4.2.39 → mainsequence-4.2.40}/tests/test_meta_table_migrations.py

@@ -16,7 +16,11 @@ from mainsequence.client.metatables import (
     MetaTable,
     TimeIndexMetaData,
 )
-from mainsequence.meta_tables import PlatformManagedMetaTable, PlatformTimeIndexMetaData
+from mainsequence.meta_tables import (
+    PlatformManagedMetaTable,
+    PlatformTimeIndexMetaData,
+    schema_index_name,
+)
 from mainsequence.meta_tables.migrations import (
     DEFAULT_ALEMBIC_VERSION_COLUMN_NAME,
     DEFAULT_ALEMBIC_VERSION_IDENTIFIER,
@@ -1005,6 +1009,68 @@ def test_prepare_for_alembic_routes_time_indexed_models_to_dynamic_table_bulk_cr
     assert "schema_management" not in row
 
 
+def test_provider_adds_time_index_grain_index_when_table_cls_is_overridden():
+    class Base(DeclarativeBase):
+        metadata = MetaData(schema="public")
+
+    class CustomTimeIndexMixin(PlatformTimeIndexMetaData):
+        __abstract__ = True
+
+        @classmethod
+        def __table_cls__(cls, *args, **kwargs):
+            name, metadata, *table_items = args
+            return Table(str(name), metadata, *table_items, **kwargs)
+
+    class ProjectAlembicVersion(AlembicVersionMetaTable):
+        __metatable_uid__ = "registry-meta-table-uid"
+        __metatable_data_source_uid__ = "data-source-uid"
+
+    class Prices(CustomTimeIndexMixin, Base):
+        __tablename__ = "example_assets__prices"
+        __metatable_data_source_uid__ = "data-source-uid"
+        __metatable_namespace__ = "example.assets"
+        __metatable_identifier__ = "Prices"
+        __time_index_name__ = "time_index"
+        __index_names__ = ["time_index", "asset_identifier"]
+
+        time_index: Mapped[datetime.datetime] = mapped_column(
+            DateTime(timezone=True),
+            nullable=False,
+        )
+        asset_identifier: Mapped[str] = mapped_column(String(255), nullable=False)
+        close: Mapped[int] = mapped_column(Integer, nullable=True)
+
+    assert not Prices.__table__.indexes
+    assert Prices.__table__.schema == "public"
+    assert "public.example_assets__prices" in Base.metadata.tables
+
+    AlembicMetaTableMigration(
+        package="sample",
+        migration_namespace="markets",
+        script_location="sample:migrations",
+        target_metadata=Base.metadata,
+        alembic_registry=ProjectAlembicVersion,
+        metatable_models=[Prices],
+    )
+
+    assert Prices.__table__.schema is None
+    assert "example_assets__prices" in Base.metadata.tables
+    assert "public.example_assets__prices" not in Base.metadata.tables
+
+    grain_indexes = [
+        index
+        for index in Prices.__table__.indexes
+        if index.unique
+        and [column.name for column in index.columns] == ["time_index", "asset_identifier"]
+    ]
+    assert len(grain_indexes) == 1
+    assert grain_indexes[0].name == schema_index_name(
+        "example_assets__prices",
+        ["time_index", "asset_identifier"],
+        unique=True,
+    )
+
+
 def test_prepare_for_alembic_reserves_existing_table_name_with_provider_identity(monkeypatch):
     class Base(DeclarativeBase):
         metadata = MetaData()

{mainsequence-4.2.39 → mainsequence-4.2.40}/tests/test_meta_tables_sqlalchemy_contracts.py

@@ -710,6 +710,63 @@ def test_platform_managed_schema_resolves_from_sqlalchemy_table_args_only():
     assert sqlalchemy_contracts._resolve_class_schema(Account) == "table_args_schema"
 
 
+def test_platform_managed_default_public_schema_stays_sqlalchemy_default():
+    pytest.importorskip("sqlalchemy")
+
+    from sqlalchemy import MetaData
+    from sqlalchemy import Uuid as SQLAlchemyUuid
+    from sqlalchemy.orm import DeclarativeBase, mapped_column
+
+    class Base(DeclarativeBase):
+        metadata = MetaData()
+
+    class Account(PlatformManagedMetaTable, Base):
+        __tablename__ = "example_assets__account"
+        __table_args__ = {"schema": "public"}
+        __metatable_namespace__ = "example.assets"
+        __metatable_identifier__ = "Account"
+
+        uid: Mapped[uuid.UUID] = mapped_column(SQLAlchemyUuid, primary_key=True)
+
+    assert Account.__table__.schema is None
+    assert sqlalchemy_contracts._resolve_schema(Account.__table__) == "public"
+
+    request = Account.build_registration_request(
+        data_source_uid="dddddddd-dddd-4ddd-8ddd-dddddddddddd",
+    )
+
+    assert request.table_contract.physical.schema_ == "public"
+
+
+def test_platform_managed_default_public_metadata_schema_stays_sqlalchemy_default():
+    pytest.importorskip("sqlalchemy")
+
+    from sqlalchemy import MetaData
+    from sqlalchemy import Uuid as SQLAlchemyUuid
+    from sqlalchemy.orm import DeclarativeBase, mapped_column
+
+    class Base(DeclarativeBase):
+        metadata = MetaData(schema="public")
+
+    class Account(PlatformManagedMetaTable, Base):
+        __tablename__ = "example_assets__account"
+        __metatable_namespace__ = "example.assets"
+        __metatable_identifier__ = "Account"
+
+        uid: Mapped[uuid.UUID] = mapped_column(SQLAlchemyUuid, primary_key=True)
+
+    assert Account.__table__.schema is None
+    assert Account.__table__.fullname == "example_assets__account"
+    assert "example_assets__account" in Base.metadata.tables
+    assert "public.example_assets__account" not in Base.metadata.tables
+
+    request = Account.build_registration_request(
+        data_source_uid="dddddddd-dddd-4ddd-8ddd-dddddddddddd",
+    )
+
+    assert request.table_contract.physical.schema_ == "public"
+
+
 def test_time_index_optional_table_info_resolvers_allow_pending_declarative_class():
     class PendingTimeIndexTable:
         __time_index_name__ = "time_index"
@@ -1663,14 +1720,15 @@ def test_platform_managed_register_preserves_authored_sqlalchemy_table_name(
     assert Account.get_storage_hash() == storage_hash
     assert Account.get_physical_table_name() == "example_assets__account"
     assert Account.__table__.name == "example_assets__account"
-    assert Account.__table__.fullname == "public.example_assets__account"
-    assert Base.metadata.tables["public.example_assets__account"] is Account.__table__
+    assert Account.__table__.schema is None
+    assert Account.__table__.fullname == "example_assets__account"
+    assert Base.metadata.tables["example_assets__account"] is Account.__table__
     assert f"public.{physical_table_name}" not in Base.metadata.tables
 
     compiled_sql = str(
         select(Account.__table__).compile(dialect=postgresql.dialect(paramstyle="pyformat"))
     )
-    assert "FROM public.example_assets__account" in compiled_sql
+    assert "FROM example_assets__account" in compiled_sql
     assert physical_table_name not in compiled_sql
     assert storage_hash not in compiled_sql
 
@@ -1702,7 +1760,8 @@ def test_bound_parent_table_foreign_key_stays_sqlalchemy_only():
         )
     )
 
-    assert Account.__table__.fullname == "public.example_assets__account"
+    assert Account.__table__.schema is None
+    assert Account.__table__.fullname == "example_assets__account"
 
     class Asset(PlatformManagedMetaTable, Base):
         __tablename__ = "example_assets__asset"
@@ -1712,7 +1771,7 @@ def test_bound_parent_table_foreign_key_stays_sqlalchemy_only():
         uid: Mapped[uuid.UUID] = mapped_column(Uuid, primary_key=True)
         account_uid: Mapped[uuid.UUID] = mapped_column(
             Uuid,
-            ForeignKey("public.example_assets__account.uid", ondelete="RESTRICT"),
+            ForeignKey("example_assets__account.uid", ondelete="RESTRICT"),
             nullable=False,
         )
         symbol: Mapped[str] = mapped_column(String(64), nullable=False)