mainsequence 6.0.43__tar.gz → 6.0.45__tar.gz

{mainsequence-6.0.43/mainsequence.egg-info → mainsequence-6.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 6.0.43
+Version: 6.0.45
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License-Expression: LicenseRef-MainSequence-Proprietary

{mainsequence-6.0.43 → mainsequence-6.0.45}/mainsequence/client/metatables/core.py

@@ -3719,6 +3719,13 @@ class TimeIndexMetaTable(MetaTable):
 
 class Scheduler(BasePydanticModel, BaseObjectOrm):
     uid: str | None = Field(None, description="Public uid of this scheduler")
+    organization_project_environment_uid: str = Field(
+        ...,
+        description=(
+            "Read-only public UID of the Organization Environment derived by the "
+            "backend from the scheduler's update nodes."
+        ),
+    )
     name: str
     is_running: bool
     running_process_pid: int | None

{mainsequence-6.0.43 → mainsequence-6.0.45}/mainsequence/client/models_helpers.py

@@ -760,6 +760,14 @@ class JobRun(BaseObjectOrm, BasePydanticModel):
         description="Read-only repository branch name associated with the run, or null for an unscoped run.",
         examples=["main"],
     )
+    organization_project_environment_uid: str = Field(
+        ...,
+        description=(
+            "Read-only public UID of the Organization Environment resolved from the "
+            "JobRun's owning project branch."
+        ),
+        examples=["58218213-5e4e-43de-a5bd-6757f4e1c8f6"],
+    )
 
     execution_start: datetime.datetime | None = Field(
         default=None,

{mainsequence-6.0.43 → mainsequence-6.0.45/mainsequence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 6.0.43
+Version: 6.0.45
 Summary: Main Sequence SDK 
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License-Expression: LicenseRef-MainSequence-Proprietary

{mainsequence-6.0.43 → mainsequence-6.0.45}/mainsequence.egg-info/SOURCES.txt

@@ -101,6 +101,7 @@ tests/test_data_node_update_flow.py
 tests/test_dependency_extras.py
 tests/test_duckdb_interface_dimensions.py
 tests/test_environment_resource_context.py
+tests/test_environment_response_contracts.py
 tests/test_filter_normalization.py
 tests/test_instrumentation.py
 tests/test_local_ops.py
@@ -117,6 +118,7 @@ tests/test_project_runtime_context.py
 tests/test_project_skills.py
 tests/test_run_configuration.py
 tests/test_scaffold_skills.py
+tests/test_scheduler_client_model.py
 tests/test_schema_names.py
 tests/test_secret_client_model.py
 tests/test_source_table_configuration.py

{mainsequence-6.0.43 → mainsequence-6.0.45}/pyproject.toml

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

{mainsequence-6.0.43 → mainsequence-6.0.45}/tests/test_cli.py

@@ -5803,6 +5803,9 @@ def test_get_project_job_run_logs_uses_client_model(cli_mod, monkeypatch):
                     "project_name": "market-data-service",
                     "project_branch_uid": "5a28020a-0f1b-47ee-aab8-334286234bea",
                     "project_branch_name": "main",
+                    "organization_project_environment_uid": (
+                        "58218213-5e4e-43de-a5bd-6757f4e1c8f6"
+                    ),
                     "status": "RUNNING",
                     "runtime_image_uid": "6cfdb152-923e-45b9-a150-c4541c68b0d1",
                     "runtime_image_digest": "sha256:" + "b" * 64,
@@ -5811,6 +5814,9 @@ def test_get_project_job_run_logs_uses_client_model(cli_mod, monkeypatch):
 
         def get_logs(self, *, timeout=None):
             captured["get_logs_timeout"] = timeout
+            captured["organization_project_environment_uid"] = (
+                self.organization_project_environment_uid
+            )
             return {
                 "job_run_uid": self.uid,
                 "status": self.status,
@@ -5829,6 +5835,9 @@ def test_get_project_job_run_logs_uses_client_model(cli_mod, monkeypatch):
     out = api_mod.get_project_job_run_logs("4c1d77c8-8a42-42b8-a9c1-06be9a336e5d")
     assert captured["job_run_uid_arg"] == "4c1d77c8-8a42-42b8-a9c1-06be9a336e5d"
     assert captured["get_logs_timeout"] is None
+    assert captured["organization_project_environment_uid"] == (
+        "58218213-5e4e-43de-a5bd-6757f4e1c8f6"
+    )
     assert captured["jwt"] == ("acc", "ref")
     assert out == {
         "job_run_uid": "4c1d77c8-8a42-42b8-a9c1-06be9a336e5d",

mainsequence-6.0.45/tests/test_environment_response_contracts.py

@@ -0,0 +1,96 @@
+import pytest
+
+import mainsequence.client.agent_runtime_models as agent_models
+import mainsequence.client.metatables.core as metatable_models
+import mainsequence.client.models_foundry as foundry_models
+import mainsequence.client.models_helpers as helper_models
+
+ENVIRONMENT_UID_FIELD = "organization_project_environment_uid"
+ENVIRONMENT_NAME_FIELD = "organization_project_environment_name"
+
+
+@pytest.mark.parametrize(
+    ("serializer_names", "model", "expected_fields"),
+    [
+        pytest.param(
+            ("AgentSerializer",),
+            agent_models.Agent,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="agent",
+        ),
+        pytest.param(
+            ("AgentSemanticSearchResultSerializer",),
+            agent_models.AgentSemanticSearchResult,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="agent-semantic-search-result",
+        ),
+        pytest.param(
+            ("JobSerializer",),
+            helper_models.Job,
+            {ENVIRONMENT_UID_FIELD},
+            id="job",
+        ),
+        pytest.param(
+            ("JobRunSerializer", "JobRunLightSerializer"),
+            helper_models.JobRun,
+            {ENVIRONMENT_UID_FIELD},
+            id="job-run",
+        ),
+        pytest.param(
+            ("ProjectBranchSerializer",),
+            foundry_models.ProjectBranch,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="project-branch",
+        ),
+        pytest.param(
+            ("BucketSerializer",),
+            foundry_models.Bucket,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="bucket",
+        ),
+        pytest.param(
+            ("ArtifactSerializer",),
+            foundry_models.Artifact,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="artifact",
+        ),
+        pytest.param(
+            ("SecretNameSerializer", "SecretValueSerializer"),
+            foundry_models.Secret,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="secret",
+        ),
+        pytest.param(
+            ("ConstantSerializer",),
+            foundry_models.Constant,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="constant",
+        ),
+        pytest.param(
+            ("MetaTableSerializer",),
+            metatable_models.MetaTable,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="meta-table",
+        ),
+        pytest.param(
+            ("MetaTableSerializer",),
+            metatable_models.TimeIndexMetaTable,
+            {ENVIRONMENT_UID_FIELD, ENVIRONMENT_NAME_FIELD},
+            id="time-index-meta-table",
+        ),
+        pytest.param(
+            ("SchedulerSerializer", "SchedulerMinimalSerializer"),
+            metatable_models.Scheduler,
+            {ENVIRONMENT_UID_FIELD},
+            id="scheduler",
+        ),
+    ],
+)
+def test_backend_environment_response_contract_is_declared_by_strict_sdk_model(
+    serializer_names,
+    model,
+    expected_fields,
+):
+    """Keep SDK response models aligned with ADR-0036/ADR-0037 projections."""
+    assert model.model_config.get("extra") == "forbid", serializer_names
+    assert expected_fields <= set(model.model_fields), serializer_names

{mainsequence-6.0.43 → mainsequence-6.0.45}/tests/test_filter_normalization.py

@@ -180,6 +180,7 @@ def test_job_run_status_uses_status_detail_endpoint(monkeypatch):
         project_name=None,
         project_branch_uid=None,
         project_branch_name=None,
+        organization_project_environment_uid=ENVIRONMENT_UID,
         runtime_image_uid="6cfdb152-923e-45b9-a150-c4541c68b0d1",
         runtime_image_digest="sha256:" + "b" * 64,
     )
@@ -271,6 +272,7 @@ def test_job_run_deserializes_uid_payload_without_id():
         project_name="market-data-service",
         project_branch_uid="5a28020a-0f1b-47ee-aab8-334286234bea",
         project_branch_name="main",
+        organization_project_environment_uid=ENVIRONMENT_UID,
         status="RUNNING",
         cpu_request="1",
         cpu_limit="2",
@@ -286,6 +288,7 @@ def test_job_run_deserializes_uid_payload_without_id():
     dumped = job_run.model_dump()
     assert dumped["uid"] == "4c1d77c8-8a42-42b8-a9c1-06be9a336e5d"
     assert dumped["job_uid"] == "ab6a5d50-8a3e-4f0d-a9bb-7e84180bd50e"
+    assert dumped["organization_project_environment_uid"] == ENVIRONMENT_UID
     assert "id" not in dumped
 
 
@@ -2464,6 +2467,7 @@ def test_job_run_requires_immutable_runtime_image_snapshot():
         "project_name": "market-data-service",
         "project_branch_uid": "5a28020a-0f1b-47ee-aab8-334286234bea",
         "project_branch_name": "main",
+        "organization_project_environment_uid": ENVIRONMENT_UID,
         "commit_hash": "a" * 40,
         "runtime_image_uid": "6cfdb152-923e-45b9-a150-c4541c68b0d1",
         "runtime_image_digest": "sha256:" + "b" * 64,
@@ -2477,6 +2481,7 @@ def test_job_run_requires_immutable_runtime_image_snapshot():
     assert run.project_name == payload["project_name"]
     assert run.project_branch_uid == payload["project_branch_uid"]
     assert run.project_branch_name == payload["project_branch_name"]
+    assert run.organization_project_environment_uid == ENVIRONMENT_UID
 
     missing_project_context = dict(payload)
     missing_project_context.pop("project_uid")
@@ -2492,6 +2497,7 @@ def test_job_run_requires_immutable_runtime_image_snapshot():
                 "project_name": None,
                 "project_branch_uid": None,
                 "project_branch_name": None,
+                "organization_project_environment_uid": ENVIRONMENT_UID,
                 "runtime_image_digest": "sha256:" + "b" * 64,
             }
         )

mainsequence-6.0.45/tests/test_scheduler_client_model.py

@@ -0,0 +1,122 @@
+import pytest
+from pydantic import ValidationError
+
+import mainsequence.client.metatables.core as core_mod
+
+ENVIRONMENT_UID = "58218213-5e4e-43de-a5bd-6757f4e1c8f6"
+SCHEDULER_UID = "00000000-0000-4000-8000-000000000001"
+UPDATE_NODE_UID = "00000000-0000-4000-8000-000000000002"
+
+
+def _scheduler_payload():
+    return {
+        "uid": SCHEDULER_UID,
+        "organization_project_environment_uid": ENVIRONMENT_UID,
+        "name": "tutorial",
+        "is_running": False,
+        "running_process_pid": None,
+        "running_in_debug_mode": True,
+        "updates_halted": False,
+        "host": None,
+        "api_address": None,
+        "api_port": None,
+        "last_heart_beat": None,
+        "pre_loads_in_tree": [],
+        "in_active_tree": [],
+        "schedules_to": [],
+    }
+
+
+class _SchedulerResponse:
+    status_code = 200
+    text = ""
+
+    @staticmethod
+    def json():
+        return _scheduler_payload()
+
+    @staticmethod
+    def raise_for_status():
+        return None
+
+
+def test_scheduler_strict_model_accepts_environment_projection():
+    scheduler = core_mod.Scheduler.model_validate(_scheduler_payload())
+
+    assert scheduler.organization_project_environment_uid == ENVIRONMENT_UID
+
+    with pytest.raises(ValidationError, match="unexpected_projection"):
+        core_mod.Scheduler.model_validate(
+            {**_scheduler_payload(), "unexpected_projection": "rejected"}
+        )
+
+
+def test_scheduler_build_derives_environment_without_request_override(monkeypatch):
+    captured = {}
+
+    def _fake_make_request(**kwargs):
+        captured.update(kwargs)
+        return _SchedulerResponse()
+
+    monkeypatch.setattr(
+        core_mod.Scheduler,
+        "build_session",
+        classmethod(lambda cls: object()),
+    )
+    monkeypatch.setattr(core_mod, "make_request", _fake_make_request)
+
+    scheduler = core_mod.Scheduler.build_and_assign_to_update_nodes(
+        scheduler_name="tutorial",
+        update_node_uids=[UPDATE_NODE_UID],
+        timeout=11,
+    )
+
+    request_body = captured["payload"]["json"]
+    assert "organization_project_environment_uid" not in request_body
+    assert "organization_project_environment_uid" not in request_body["scheduler_kwargs"]
+    assert request_body["update_node_uids"] == [UPDATE_NODE_UID]
+    assert captured["time_out"] == 11
+    assert scheduler.organization_project_environment_uid == ENVIRONMENT_UID
+
+
+def test_scheduler_get_for_update_node_accepts_environment_projection(monkeypatch):
+    captured = {}
+
+    def _fake_make_request(**kwargs):
+        captured.update(kwargs)
+        return _SchedulerResponse()
+
+    monkeypatch.setattr(
+        core_mod.Scheduler,
+        "build_session",
+        classmethod(lambda cls: object()),
+    )
+    monkeypatch.setattr(core_mod, "make_request", _fake_make_request)
+
+    scheduler = core_mod.Scheduler.get_scheduler_for_update_node(UPDATE_NODE_UID)
+
+    assert captured["r_type"] == "GET"
+    assert captured["payload"] == {"params": {"update_node_uid": UPDATE_NODE_UID}}
+    assert scheduler.organization_project_environment_uid == ENVIRONMENT_UID
+
+
+def test_scheduler_assign_accepts_environment_projection(monkeypatch):
+    captured = {}
+    scheduler = core_mod.Scheduler.model_validate(_scheduler_payload())
+
+    def _fake_make_request(**kwargs):
+        captured.update(kwargs)
+        return _SchedulerResponse()
+
+    monkeypatch.setattr(
+        core_mod.Scheduler,
+        "build_session",
+        classmethod(lambda cls: object()),
+    )
+    monkeypatch.setattr(core_mod, "make_request", _fake_make_request)
+
+    assigned = scheduler.assign_to_scheduler([UPDATE_NODE_UID])
+
+    assert captured["r_type"] == "PATCH"
+    assert captured["payload"] == {"json": {"update_node_uids": [UPDATE_NODE_UID]}}
+    assert assigned.organization_project_environment_uid == ENVIRONMENT_UID