futurehouse-client 0.4.1__tar.gz → 0.4.2.dev11__tar.gz

{futurehouse_client-0.4.1/futurehouse_client.egg-info → futurehouse_client-0.4.2.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.1
+Version: 0.4.2.dev11
 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.4.1 → futurehouse_client-0.4.2.dev11}/futurehouse_client/clients/rest_client.py

@@ -1746,22 +1746,19 @@ class RestClient:
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    def get_project_by_name(self, name: str) -> UUID:
+    def get_project_by_name(self, name: str, limit: int = 2) -> UUID | list[UUID]:
         """Get a project UUID by name.
 
         Args:
             name: The name of the project to find
+            limit: Maximum number of projects to return
 
         Returns:
-            UUID of the project as a string
-
-        Raises:
-            ProjectError: If no project is found, multiple projects are found, or there's an error
+            UUID of the project as a string or a list of UUIDs if multiple projects are found
         """
         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}
+                "/v0.1/projects", params={"limit": limit, "name": name}
             )
             response.raise_for_status()
             projects = response.json()
@@ -1774,32 +1771,33 @@ class RestClient:
         if len(projects) == 0:
             raise ProjectError(f"No project found with name '{name}'")
         if len(projects) > 1:
-            raise ProjectError(
+            logger.warning(
                 f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
             )
 
-        return UUID(projects[0]["id"])
+        ids = [UUID(project["id"]) for project in projects]
+        return ids[0] if len(ids) == 1 else ids
 
     @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:
+    async def aget_project_by_name(
+        self, name: str, limit: int = 2
+    ) -> UUID | list[UUID]:
         """Asynchronously get a project UUID by name.
 
         Args:
             name: The name of the project to find
+            limit: Maximum number of projects to return
 
         Returns:
-            UUID of the project as a string
-
-        Raises:
-            ProjectError: If no project is found, multiple projects are found, or there's an error
+            UUID of the project as a string or a list of UUIDs if multiple projects are found
         """
         try:
             response = await self.async_client.get(
-                "/v0.1/projects", params={"limit": 2, "name": name}
+                "/v0.1/projects", params={"limit": limit, "name": name}
             )
             response.raise_for_status()
             projects = response.json()
@@ -1808,11 +1806,12 @@ class RestClient:
         if len(projects) == 0:
             raise ProjectError(f"No project found with name '{name}'")
         if len(projects) > 1:
-            raise ProjectError(
+            logger.warning(
                 f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
             )
 
-        return UUID(projects[0]["id"])
+        ids = [UUID(project["id"]) for project in projects]
+        return ids[0] if len(ids) == 1 else ids
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),

{futurehouse_client-0.4.1 → futurehouse_client-0.4.2.dev11}/futurehouse_client/models/client.py

@@ -27,17 +27,13 @@ class InitialState(BaseState):
 
 class ASVState(BaseState, Generic[T]):
     action: OpResult[T] = Field()
-    next_state: Any = Field()
+    next_agent_state: Any = Field()
     value: float = Field()
 
     @field_serializer("action")
     def serialize_action(self, action: OpResult[T]) -> dict:
         return action.to_dict()
 
-    @field_serializer("next_state")
-    def serialize_next_state(self, state: Any) -> str:
-        return str(state)
-
 
 class EnvResetState(BaseState):
     observations: list[Message] = Field()

futurehouse_client-0.4.2.dev11/futurehouse_client/version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.4.2.dev11'
+__version_tuple__ = version_tuple = (0, 4, 2, 'dev11')
+
+__commit_id__ = commit_id = 'ge97af7bf7'

{futurehouse_client-0.4.1 → futurehouse_client-0.4.2.dev11/futurehouse_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.1
+Version: 0.4.2.dev11
 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.4.1 → futurehouse_client-0.4.2.dev11}/tests/test_rest.py

@@ -820,13 +820,14 @@ class TestProjectOperations:
             mock_response = MagicMock()
             mock_response.raise_for_status.return_value = None
             mock_response.json.return_value = [
-                {"id": "uuid1", "name": "test"},
-                {"id": "uuid2", "name": "test"},
+                {"id": str(uuid4()), "name": "test"},
+                {"id": str(uuid4()), "name": "test"},
             ]
             mock_get.return_value = mock_response
 
-            with pytest.raises(ProjectError, match="Multiple projects found"):
-                admin_client.get_project_by_name("test")
+            projects = admin_client.get_project_by_name("test")
+            assert isinstance(projects, list)
+            assert len(projects) == 2
 
     def test_add_task_to_project_success(
         self, admin_client: RestClient, test_project_name: str, task_req: TaskRequest

futurehouse_client-0.4.1/futurehouse_client/version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '0.4.1'
-__version_tuple__ = version_tuple = (0, 4, 1)