futurehouse-client 0.3.20.dev202__tar.gz → 0.3.20.dev215__tar.gz

{futurehouse_client-0.3.20.dev202/futurehouse_client.egg-info → futurehouse_client-0.3.20.dev215}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.20.dev202
+Version: 0.3.20.dev215
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License

{futurehouse_client-0.3.20.dev202 → futurehouse_client-0.3.20.dev215}/futurehouse_client/clients/rest_client.py

@@ -1568,6 +1568,79 @@ class RestClient:
                 f"An unexpected error occurred during world model creation: {e}"
             ) from e
 
+    @retry(
+        stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
+        wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
+        retry=retry_if_connection_error,
+    )
+    def get_project_by_name(self, name: str) -> UUID:
+        """Get a project UUID by name.
+
+        Args:
+            name: The name of the project to find
+
+        Returns:
+            UUID of the project as a string
+
+        Raises:
+            ProjectError: If no project is found, multiple projects are found, or there's an error
+        """
+        try:
+            # Get projects filtered by name (backend now filters by name and owner)
+            response = self.client.get(
+                "/v0.1/projects", params={"limit": 2, "name": name}
+            )
+            response.raise_for_status()
+            projects = response.json()
+        except HTTPStatusError as e:
+            raise ProjectError(
+                f"Error getting project by name: {e.response.status_code} - {e.response.text}"
+            ) from e
+        except Exception as e:
+            raise ProjectError(f"Error getting project by name: {e}") from e
+        if len(projects) == 0:
+            raise ProjectError(f"No project found with name '{name}'")
+        if len(projects) > 1:
+            raise ProjectError(
+                f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
+            )
+
+        return UUID(projects[0]["id"])
+
+    @retry(
+        stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
+        wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
+        retry=retry_if_connection_error,
+    )
+    async def aget_project_by_name(self, name: str) -> UUID:
+        """Asynchronously get a project UUID by name.
+
+        Args:
+            name: The name of the project to find
+
+        Returns:
+            UUID of the project as a string
+
+        Raises:
+            ProjectError: If no project is found, multiple projects are found, or there's an error
+        """
+        try:
+            response = await self.async_client.get(
+                "/v0.1/projects", params={"limit": 2, "name": name}
+            )
+            response.raise_for_status()
+            projects = response.json()
+        except Exception as e:
+            raise ProjectError(f"Error getting project by name: {e}") from e
+        if len(projects) == 0:
+            raise ProjectError(f"No project found with name '{name}'")
+        if len(projects) > 1:
+            raise ProjectError(
+                f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
+            )
+
+        return UUID(projects[0]["id"])
+
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
@@ -1602,7 +1675,7 @@ class RestClient:
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    def add_task_to_project(self, project_id: str, trajectory_id: str) -> None:
+    def add_task_to_project(self, project_id: UUID, trajectory_id: str) -> None:
         """Add a trajectory to a project.
 
         Args:
@@ -1667,7 +1740,7 @@ class RestClient:
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    async def aadd_task_to_project(self, project_id: str, trajectory_id: str) -> None:
+    async def aadd_task_to_project(self, project_id: UUID, trajectory_id: str) -> None:
         """Asynchronously add a trajectory to a project.
 
         Args:

{futurehouse_client-0.3.20.dev202 → futurehouse_client-0.3.20.dev215}/futurehouse_client/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.20.dev202'
-__version_tuple__ = version_tuple = (0, 3, 20, 'dev202')
+__version__ = version = '0.3.20.dev215'
+__version_tuple__ = version_tuple = (0, 3, 20, 'dev215')

{futurehouse_client-0.3.20.dev202 → futurehouse_client-0.3.20.dev215/futurehouse_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.20.dev202
+Version: 0.3.20.dev215
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License

{futurehouse_client-0.3.20.dev202 → futurehouse_client-0.3.20.dev215}/tests/test_rest.py

@@ -8,6 +8,7 @@ import time
 import types
 from pathlib import Path
 from unittest.mock import MagicMock, mock_open, patch
+from uuid import UUID, uuid4
 
 import pytest
 from futurehouse_client.clients import (
@@ -15,6 +16,7 @@ from futurehouse_client.clients import (
 )
 from futurehouse_client.clients.rest_client import (
     FileUploadError,
+    ProjectError,
     RestClient,
     RestClientError,
 )
@@ -745,3 +747,129 @@ def test_world_model_create_and_get(admin_client: RestClient):
     assert updated_model_by_id.name == model.name
     assert updated_model_by_id.content != model.content
     assert updated_model_by_name.content != model.content
+
+
+class TestProjectOperations:
+    @pytest.fixture
+    def test_project_name(self):
+        return f"test-project-{int(time.time())}"
+
+    def test_create_project_success(
+        self, admin_client: RestClient, test_project_name: str
+    ):
+        project_id = admin_client.create_project(test_project_name)
+        assert isinstance(project_id, str)
+        UUID(project_id)
+
+    def test_get_project_by_name_success(
+        self, admin_client: RestClient, test_project_name: str
+    ):
+        created_project_id = admin_client.create_project(test_project_name)
+        retrieved_project_id = admin_client.get_project_by_name(test_project_name)
+        assert str(retrieved_project_id) == created_project_id
+
+    def test_get_project_by_name_not_found(self, admin_client: RestClient):
+        with pytest.raises(ProjectError, match="No project found with name"):
+            admin_client.get_project_by_name("non-existent-project-12345")
+
+    def test_get_project_by_name_multiple_found(self, admin_client: RestClient):
+        with patch.object(admin_client.client, "get") as mock_get:
+            mock_response = MagicMock()
+            mock_response.raise_for_status.return_value = None
+            mock_response.json.return_value = [
+                {"id": "uuid1", "name": "test"},
+                {"id": "uuid2", "name": "test"},
+            ]
+            mock_get.return_value = mock_response
+
+            with pytest.raises(ProjectError, match="Multiple projects found"):
+                admin_client.get_project_by_name("test")
+
+    def test_add_task_to_project_success(
+        self, admin_client: RestClient, test_project_name: str, task_req: TaskRequest
+    ):
+        project_id = admin_client.create_project(test_project_name)
+        trajectory_id = admin_client.create_task(task_req)
+        admin_client.add_task_to_project(UUID(project_id), trajectory_id)
+
+    def test_add_task_to_project_not_found(self, admin_client: RestClient):
+        fake_project_id = uuid4()
+        fake_trajectory_id = str(uuid4())
+
+        with patch.object(admin_client.client, "post") as mock_post:
+            mock_response = MagicMock()
+            mock_response.raise_for_status.side_effect = Exception("404 Not Found")
+            mock_post.return_value = mock_response
+
+            with pytest.raises(
+                ProjectError, match="Error adding trajectory to project"
+            ):
+                admin_client.add_task_to_project(fake_project_id, fake_trajectory_id)
+
+    def test_create_project_with_http_error(self, admin_client: RestClient):
+        with patch.object(admin_client.client, "post") as mock_post:
+            mock_response = MagicMock()
+            mock_response.raise_for_status.side_effect = Exception("400 Bad Request")
+            mock_response.status_code = 400
+            mock_response.text = "Invalid project name"
+            mock_post.return_value = mock_response
+
+            with pytest.raises(ProjectError, match="Error creating project"):
+                admin_client.create_project("invalid project name")
+
+
+class TestAsyncProjectOperations:
+    @pytest.fixture
+    def test_project_name(self):
+        return f"test-async-project-{int(time.time())}"
+
+    @pytest.mark.asyncio
+    async def test_acreate_project_success(
+        self, admin_client: RestClient, test_project_name: str
+    ):
+        project_id = await admin_client.acreate_project(test_project_name)
+        assert isinstance(project_id, str)
+        UUID(project_id)
+
+    @pytest.mark.asyncio
+    async def test_aget_project_by_name_success(
+        self, admin_client: RestClient, test_project_name: str
+    ):
+        created_project_id = await admin_client.acreate_project(test_project_name)
+        retrieved_project_id = await admin_client.aget_project_by_name(
+            test_project_name
+        )
+        assert str(retrieved_project_id) == created_project_id
+
+    @pytest.mark.asyncio
+    async def test_aget_project_by_name_not_found(self, admin_client: RestClient):
+        with pytest.raises(ProjectError, match="No project found with name"):
+            await admin_client.aget_project_by_name("non-existent-async-project-12345")
+
+    @pytest.mark.asyncio
+    async def test_aadd_task_to_project_success(
+        self, admin_client: RestClient, test_project_name: str, task_req: TaskRequest
+    ):
+        project_id = await admin_client.acreate_project(test_project_name)
+        trajectory_id = await admin_client.acreate_task(task_req)
+        await admin_client.aadd_task_to_project(UUID(project_id), trajectory_id)
+
+    @pytest.mark.asyncio
+    async def test_aadd_task_to_project_permission_denied(
+        self, admin_client: RestClient
+    ):
+        fake_project_id = uuid4()
+        fake_trajectory_id = str(uuid4())
+
+        with patch.object(admin_client.async_client, "post") as mock_post:
+            mock_response = MagicMock()
+            mock_response.raise_for_status.side_effect = Exception("403 Forbidden")
+            mock_response.status_code = 403
+            mock_post.return_value = mock_response
+
+            with pytest.raises(
+                ProjectError, match="Error adding trajectory to project: 403 Forbidden"
+            ):
+                await admin_client.aadd_task_to_project(
+                    fake_project_id, fake_trajectory_id
+                )