futurehouse-client 0.4.5.dev201__py3-none-any.whl → 0.5.1__py3-none-any.whl

futurehouse_client/clients/data_storage_methods.py

@@ -2492,7 +2492,11 @@ class DataStorageMethods:
                 return [
                     self._download_from_gcs(
                         location.storage_config.signed_url or "",
-                        (location.storage_config.location or "").split("/")[-1],
+                        (
+                            Path(location.storage_config.location).name
+                            if location.storage_config.location
+                            else None
+                        ),
                     )
                     for location in result.storage_locations
                 ]
@@ -2508,7 +2512,12 @@ class DataStorageMethods:
                     )
 
                 return self._download_from_gcs(
-                    storage_location.storage_config.signed_url
+                    storage_location.storage_config.signed_url,
+                    (
+                        Path(storage_location.storage_config.location).name
+                        if storage_location.storage_config.location
+                        else None
+                    ),
                 )
 
             if storage_type in {"raw_content", "pg_table"}:
@@ -2568,7 +2577,11 @@ class DataStorageMethods:
                     [
                         self._adownload_from_gcs(
                             location.storage_config.signed_url or "",
-                            (location.storage_config.location or "").split("/")[-1],
+                            (
+                                location.storage_config.location.split("/")[-1]
+                                if location.storage_config.location
+                                else None
+                            ),
                         )
                         for location in result.storage_locations
                     ],
@@ -2585,7 +2598,12 @@ class DataStorageMethods:
                     )
 
                 return await self._adownload_from_gcs(
-                    storage_location.storage_config.signed_url
+                    storage_location.storage_config.signed_url,
+                    (
+                        storage_location.storage_config.location.split("/")[-1]
+                        if storage_location.storage_config.location
+                        else None
+                    ),
                 )
 
             if storage_type in {"raw_content", "pg_table"}:

futurehouse_client/clients/rest_client.py

@@ -676,7 +676,7 @@ class RestClient(DataStorageMethods):
             )
 
         response = self.client.post(
-            "/v0.1/crows", json=task_data.model_dump(mode="json")
+            "/v0.1/crows", json=task_data.model_dump(mode="json", by_alias=True)
         )
         if response.status_code in {401, 403}:
             raise PermissionError(
@@ -712,7 +712,7 @@ class RestClient(DataStorageMethods):
             )
 
         response = await self.async_client.post(
-            "/v0.1/crows", json=task_data.model_dump(mode="json")
+            "/v0.1/crows", json=task_data.model_dump(mode="json", by_alias=True)
         )
         if response.status_code in {401, 403}:
             raise PermissionError(

futurehouse_client/models/data_storage_methods.py

@@ -3,25 +3,14 @@ from datetime import datetime
 from enum import StrEnum, auto
 from os import PathLike
 from pathlib import Path
-from typing import Annotated, Any
+from typing import Any
 from uuid import UUID
 
 from pydantic import (
     BaseModel,
     Field,
     JsonValue,
-    PlainSerializer,
-    PlainValidator,
-    WithJsonSchema,
 )
-from sqlalchemy_utils import Ltree
-
-LtreeField = Annotated[
-    Ltree,
-    PlainValidator(Ltree),
-    PlainSerializer(lambda v: v.path),
-    WithJsonSchema({"type": "string", "examples": ["some.path"]}),
-]
 
 
 class DataStorageEntryStatus(StrEnum):

futurehouse_client/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.5.dev201'
-__version_tuple__ = version_tuple = (0, 4, 5, 'dev201')
+__version__ = version = '0.5.1'
+__version_tuple__ = version_tuple = (0, 5, 1)
 
 __commit_id__ = commit_id = None

{futurehouse_client-0.4.5.dev201.dist-info → futurehouse_client-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.5.dev201
+Version: 0.5.1
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License
@@ -224,7 +224,6 @@ Requires-Dist: openai<1.100.0,>=1
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
 Requires-Dist: requests
-Requires-Dist: sqlalchemy-utils>=0.41.2
 Requires-Dist: tenacity
 Requires-Dist: tqdm>=4.62
 Provides-Extra: dev

{futurehouse_client-0.4.5.dev201.dist-info → futurehouse_client-0.5.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 futurehouse_client/__init__.py,sha256=q5cpcuPkhTaueXsySsgWpH0F-2EsRxcdJfP91ze6khU,991
 futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=gVEi6V2NhKQOnRNh8vVkILg1cdwbsy1LGjqPIbyPeLo,721
+futurehouse_client/version.py,sha256=cYMOhuaBHd0MIZmumuccsEQ-AxM8LIJy9dsBAWgOpqE,704
 futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
-futurehouse_client/clients/data_storage_methods.py,sha256=f8ZsVicEtO50pRXoPzEB2GpiyqosNofyoW8vJeYvFnM,119266
+futurehouse_client/clients/data_storage_methods.py,sha256=eBbGdxUmk-QGmLveuwdZd4LjsElhJxJGsvu4q-MoTGY,120030
 futurehouse_client/clients/job_client.py,sha256=b5gpzulZpxpv9R337r3UKItnMdtd6CGlI1sV3_VQJso,13985
-futurehouse_client/clients/rest_client.py,sha256=kLCR4dYduwX_16jaOZ26RGCOR2A_6nk2gpBKUqQ-KVI,110247
+futurehouse_client/clients/rest_client.py,sha256=tLskIkiR6-Acbo2W1_UUNdIjiYfZMURaN_Mi0aJPWXg,110277
 futurehouse_client/models/__init__.py,sha256=N1MwDUYonsMN9NdaShsYcJspyL7H756MYj7VWFeD3fk,978
 futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
 futurehouse_client/models/client.py,sha256=554vp7Cr-17BTeRZtN5DhCRQesRRtr31ZPkHXUrhyCE,3835
-futurehouse_client/models/data_storage_methods.py,sha256=cpF2g4y_REECaz--WhaJeLqXA_3m3keRP5XOXiL8GOI,13811
+futurehouse_client/models/data_storage_methods.py,sha256=tqLBEPXyyvLNVLU167_EiEnzT8AiMWeL3Fga1HpLg5o,13533
 futurehouse_client/models/job_event.py,sha256=lMrx-lV7BQkKl419ErWZ6Q1EjurmhBFSns0z6zwGaVo,2766
 futurehouse_client/models/rest.py,sha256=SbeXZSPUCM0lQ_gVUPa64vKzMxuUVgqmJ5YThfDWs8g,4726
 futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,8 +17,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.5.dev201.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.4.5.dev201.dist-info/METADATA,sha256=2MNiAgseBRKeAO9y03jEiq2ejMC3r87PwHvS-_DGWp8,27101
-futurehouse_client-0.4.5.dev201.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.4.5.dev201.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.4.5.dev201.dist-info/RECORD,,
+futurehouse_client-0.5.1.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.5.1.dist-info/METADATA,sha256=wi9-M5bSli7khH_2ZF0tFI7nK8Hb-vajvk5OMm2735g,27054
+futurehouse_client-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.5.1.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.5.1.dist-info/RECORD,,