metafold 0.13.1.dev1__tar.gz → 0.13.2.dev0__tar.gz

{metafold-0.13.1.dev1 → metafold-0.13.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.13.1.dev1
+Version: 0.13.2.dev0
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.13.1.dev1 → metafold-0.13.2.dev0}/metafold/simulation/compression_simulation.py

@@ -656,6 +656,7 @@ class CompressionSimulation:
         base_url: str = "https://api.metafold3d.com/",
         cancel_existing_workflows: bool = True,
         project_access: Access = Access.PRIVATE,
+        user: Optional[str] = None,
     ) -> str:
         """Find an existing project by name or create a new one.
 
@@ -663,6 +664,10 @@ class CompressionSimulation:
         client_id + client_secret (local/programmable use, reads from env via
         setup_client). base_url must match the audience the token was issued for.
 
+        When user is given, only the caller's own projects are reused; a
+        same-named project owned by someone else (visible under org access) is
+        ignored so it can't be overwritten.
+
         When cancel_existing_workflows is True and an existing project is
         reused, its running workflows are cancelled first.
 
@@ -675,10 +680,14 @@ class CompressionSimulation:
             auth_domain=auth_domain,
             base_url=base_url,
         )
-        # Quote the project_name string for multi-word name searchess
+        # Quote the values so multi-word names stay a single search term.
+        q = f'name:"{project_name}"'
+        if user is not None:
+            q = f'{q} AND user:"{user}"'
         existing = [
-            p for p in client.projects.list(q=f'name:"{project_name}"')
+            p for p in client.projects.list(q=q)
             if p.name == project_name  # ensure full match
+            and (user is None or p.user == user)
         ]
         if existing:
             project_id = existing[0].id

{metafold-0.13.1.dev1 → metafold-0.13.2.dev0}/metafold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.13.1.dev1
+Version: 0.13.2.dev0
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.13.1.dev1 → metafold-0.13.2.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.13.1.dev1"
+version = "0.13.2.dev0"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]

{metafold-0.13.1.dev1 → metafold-0.13.2.dev0}/tests/test_compression_simulation.py

@@ -1439,3 +1439,74 @@ class TestFindOrCreateProjectCancel:
 
         assert pid == "new-pid"
         client.workflows.cancel.assert_not_called()
+
+
+class TestFindOrCreateProjectUserScope:
+    """With user set, only the caller's own project is reused; a same-named
+    project owned by someone else (visible under org access) is ignored."""
+
+    @pytest.fixture
+    def patched_client_class(self, monkeypatch):
+        from metafold.simulation import compression_simulation
+        fake_class = MagicMock()
+        monkeypatch.setattr(compression_simulation, "MetafoldClient", fake_class)
+        return fake_class
+
+    def _project(self, pid, name, user):
+        p = MagicMock()
+        p.id = pid
+        p.name = name
+        p.user = user
+        return p
+
+    def test_ignores_same_name_owned_by_other_user(self, patched_client_class):
+        client = patched_client_class.return_value
+        # A defensive belt-and-suspenders case: even if the API returned another
+        # user's project, the Python filter drops it and we create a new one.
+        client.projects.list.return_value = [self._project("other-pid", "shared", "userB")]
+        client.projects.create.return_value = self._project("new-pid", "shared", "userA")
+
+        pid = CompressionSimulation.find_or_create_project(
+            "shared", access_token="tok", base_url="http://x/", user="userA",
+        )
+
+        assert pid == "new-pid"
+        client.projects.create.assert_called_once()
+
+    def test_reuses_callers_own_project(self, patched_client_class):
+        client = patched_client_class.return_value
+        client.projects.list.return_value = [self._project("mine", "shared", "userA")]
+
+        pid = CompressionSimulation.find_or_create_project(
+            "shared", access_token="tok", base_url="http://x/", user="userA",
+            cancel_existing_workflows=False,
+        )
+
+        assert pid == "mine"
+        client.projects.create.assert_not_called()
+
+    def test_scopes_query_to_user(self, patched_client_class):
+        client = patched_client_class.return_value
+        client.projects.list.return_value = []
+        client.projects.create.return_value = self._project("new-pid", "shared", "userA")
+
+        CompressionSimulation.find_or_create_project(
+            "shared", access_token="tok", base_url="http://x/", user="userA",
+        )
+
+        q = client.projects.list.call_args.kwargs["q"]
+        assert 'name:"shared"' in q
+        assert 'user:"userA"' in q
+
+    def test_no_user_keeps_unscoped_behavior(self, patched_client_class):
+        client = patched_client_class.return_value
+        client.projects.list.return_value = [self._project("any-pid", "shared", "userB")]
+
+        pid = CompressionSimulation.find_or_create_project(
+            "shared", access_token="tok", base_url="http://x/",
+            cancel_existing_workflows=False,
+        )
+
+        assert pid == "any-pid"
+        q = client.projects.list.call_args.kwargs["q"]
+        assert "user:" not in q