futurehouse-client 0.4.3.dev3__py3-none-any.whl → 0.4.4.dev1__py3-none-any.whl

futurehouse_client/clients/data_storage_methods.py

@@ -476,7 +476,7 @@ class ProgressWrapper:
         return self.file_obj.tell()
 
 
-class DataStorageMethods:  # pylint: disable=too-many-public-methods
+class DataStorageMethods:
     """Data storage methods for RestClient.
 
     This class contains methods for interacting with the data storage API endpoints.
@@ -1638,13 +1638,13 @@ class DataStorageMethods:  # pylint: disable=too-many-public-methods
             existing_location = DataStorageLocationPayload(
                 storage_type=DataStorageType.LINK,
                 content_type=DataContentType.TEXT,
-                location=url,
+                location=str(url),
                 metadata=link_metadata or None,
             )
 
             payload = DataStorageRequestPayload(
                 name=name,
-                content=url,
+                content=str(url),
                 description=description,
                 dataset_id=dataset_id,
                 project_id=project_id,
@@ -1697,13 +1697,13 @@ class DataStorageMethods:  # pylint: disable=too-many-public-methods
             existing_location = DataStorageLocationPayload(
                 storage_type=DataStorageType.LINK,
                 content_type=DataContentType.TEXT,
-                location=url,
+                location=str(url),
                 metadata=link_metadata or None,
             )
 
             payload = DataStorageRequestPayload(
                 name=name,
-                content=url,
+                content=str(url),
                 description=description,
                 dataset_id=dataset_id,
                 project_id=project_id,
@@ -2552,6 +2552,70 @@ class DataStorageMethods:  # pylint: disable=too-many-public-methods
         except Exception as e:
             raise DataStorageError(f"An unexpected error occurred: {e!r}") from e
 
+    @retry(
+        stop=stop_after_attempt(3),
+        wait=wait_exponential(multiplier=1, max=10),
+        retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+    )
+    def get_data_storage_entry(self, data_storage_id: UUID) -> DataStorageResponse:
+        """Get a data storage entry with all details including storage locations and metadata.
+
+        Args:
+            data_storage_id: ID of the data storage entry to retrieve
+
+        Returns:
+            DataStorageResponse with entry details and storage locations
+
+        Raises:
+            DataStorageRetrievalError: If there's an error retrieving the entry
+        """
+        try:
+            response = self.client.get(
+                f"/v0.1/data-storage/data-entries/{data_storage_id}", timeout=100
+            )
+            response.raise_for_status()
+            return DataStorageResponse.model_validate(response.json())
+        except HTTPStatusError as e:
+            self._handle_http_errors(e, "retrieving")
+        except Exception as e:
+            raise DataStorageRetrievalError(
+                f"An unexpected error occurred: {e!r}"
+            ) from e
+
+    @retry(
+        stop=stop_after_attempt(3),
+        wait=wait_exponential(multiplier=1, max=10),
+        retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+    )
+    async def aget_data_storage_entry(
+        self, data_storage_id: UUID
+    ) -> DataStorageResponse:
+        """Get a data storage entry with all details including storage locations and metadata.
+
+        Args:
+            data_storage_id: ID of the data storage entry to retrieve
+
+        Returns:
+            DataStorageResponse with entry details and storage locations
+
+        Raises:
+            DataStorageRetrievalError: If there's an error retrieving the entry
+        """
+        try:
+            response = await self.async_client.get(
+                f"/v0.1/data-storage/data-entries/{data_storage_id}", timeout=100
+            )
+            response.raise_for_status()
+            return DataStorageResponse.model_validate(response.json())
+        except HTTPStatusError as e:
+            self._handle_http_errors(e, "retrieving")
+        except Exception as e:
+            raise DataStorageRetrievalError(
+                f"An unexpected error occurred: {e!r}"
+            ) from e
+
     @retry(
         stop=stop_after_attempt(3),
         wait=wait_exponential(multiplier=1, max=10),

futurehouse_client/clients/rest_client.py

@@ -165,7 +165,6 @@ retry_if_connection_error = create_retry_if_connection_error(FileUploadError)
 DEFAULT_AGENT_TIMEOUT: int = 2400  # seconds
 
 
-# pylint: disable=too-many-public-methods
 class RestClient(DataStorageMethods):
     REQUEST_TIMEOUT: ClassVar[float] = 30.0  # sec - for general API calls
     FILE_UPLOAD_TIMEOUT: ClassVar[float] = 600.0  # 10 minutes - for file uploads

futurehouse_client/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.3.dev3'
-__version_tuple__ = version_tuple = (0, 4, 3, 'dev3')
+__version__ = version = '0.4.4.dev1'
+__version_tuple__ = version_tuple = (0, 4, 4, 'dev1')
 
 __commit_id__ = commit_id = None

{futurehouse_client-0.4.3.dev3.dist-info → futurehouse_client-0.4.4.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.3.dev3
+Version: 0.4.4.dev1
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: aiofiles
 Requires-Dist: cloudpickle
 Requires-Dist: fhaviary
-Requires-Dist: google-resumable-media[aiohttp]
+Requires-Dist: google-resumable-media
 Requires-Dist: httpx
 Requires-Dist: ldp>=0.22.0
 Requires-Dist: litellm

{futurehouse_client-0.4.3.dev3.dist-info → futurehouse_client-0.4.4.dev1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 futurehouse_client/__init__.py,sha256=PvFTkocA-hobsWoDEBEdrUgLIbuVbDs_0nvMdImJmHk,707
 futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=_c6r7-3ldIKHE25bQ2mtbV5_BGB4bVAIxsyhTiprV-g,717
+futurehouse_client/version.py,sha256=BxZgBdyE0uyvHuv-VdQ1w9gsFCUVeItMk8dKQsNmNs0,717
 futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
-futurehouse_client/clients/data_storage_methods.py,sha256=NBbJIUF3vWc7bRYhapELegpnAlB4R38mZsSDs7Y2-Tc,97165
+futurehouse_client/clients/data_storage_methods.py,sha256=VESdX0J_frITd0QAjQ5UMPiqYvpToo0ooDCrS-U4uH8,99535
 futurehouse_client/clients/job_client.py,sha256=b5gpzulZpxpv9R337r3UKItnMdtd6CGlI1sV3_VQJso,13985
-futurehouse_client/clients/rest_client.py,sha256=Ng36P8obNW1WTRYWTqLQ0ka5tefT-r723_Kr0haT9aM,103225
+futurehouse_client/clients/rest_client.py,sha256=RdyFEipvADDCHyY5XFy565IoL9-N1myJjF0G8x2wlK8,103183
 futurehouse_client/models/__init__.py,sha256=0YlzKGymbY1g4cXxnUc0BUnthTkVBf12bCZlGUcMQqk,701
 futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
 futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
@@ -16,8 +16,8 @@ futurehouse_client/utils/general.py,sha256=PIkGLCSA3kUvc6mwR-prEB7YnMdKILOIm6cPo
 futurehouse_client/utils/module_utils.py,sha256=aFyd-X-pDARXz9GWpn8SSViUVYdSbuy9vSkrzcVIaGI,4955
 futurehouse_client/utils/monitoring.py,sha256=UjRlufe67kI3VxRHOd5fLtJmlCbVA2Wqwpd4uZhXkQM,8728
 futurehouse_client/utils/world_model_tools.py,sha256=v2krZGrco0ur2a_pcRMtnQL05SxlIoBXuJ5R1JkQNws,2921
-futurehouse_client-0.4.3.dev3.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.4.3.dev3.dist-info/METADATA,sha256=0GVESlronhQMiFUHqhgZcRw9dkmIGPdkJA7m8NY_u7E,27068
-futurehouse_client-0.4.3.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.4.3.dev3.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.4.3.dev3.dist-info/RECORD,,
+futurehouse_client-0.4.4.dev1.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.4.4.dev1.dist-info/METADATA,sha256=ez62zZde6VSXTSkCJgP_L6JPZ3LUvzVOxZN0FI-soLk,27059
+futurehouse_client-0.4.4.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.4.4.dev1.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.4.4.dev1.dist-info/RECORD,,