nvidia-nat-s3 1.3.dev0__py3-none-any.whl → 1.3.0rc1__py3-none-any.whl

nat/plugins/s3/object_store.py

@@ -41,9 +41,9 @@ class S3ObjectStoreClientConfig(ObjectStoreBaseConfig, name="s3"):
 
 
 @register_object_store(config_type=S3ObjectStoreClientConfig)
-async def s3_object_store_client(config: S3ObjectStoreClientConfig, builder: Builder):
+async def s3_object_store_client(config: S3ObjectStoreClientConfig, _builder: Builder):
 
-    from nat.plugins.s3.s3_object_store import S3ObjectStore
+    from .s3_object_store import S3ObjectStore
 
-    async with S3ObjectStore(config) as store:
+    async with S3ObjectStore(**config.model_dump(exclude={"type"}, exclude_none=False)) as store:
         yield store

nat/plugins/s3/register.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# pylint: disable=unused-import
 # flake8: noqa
 # isort:skip_file
 

nat/plugins/s3/s3_object_store.py

@@ -23,7 +23,6 @@ from nat.data_models.object_store import KeyAlreadyExistsError
 from nat.data_models.object_store import NoSuchKeyError
 from nat.object_store.interfaces import ObjectStore
 from nat.object_store.models import ObjectStoreItem
-from nat.plugins.s3.object_store import S3ObjectStoreClientConfig
 
 logger = logging.getLogger(__name__)
 
@@ -33,31 +32,31 @@ class S3ObjectStore(ObjectStore):
     S3ObjectStore is an ObjectStore implementation that uses S3 as the underlying storage.
     """
 
-    def __init__(self, config: S3ObjectStoreClientConfig):
+    def __init__(self,
+                 *,
+                 bucket_name: str,
+                 endpoint_url: str | None,
+                 access_key: str | None,
+                 secret_key: str | None,
+                 region: str | None):
 
         super().__init__()
 
-        self.bucket_name = config.bucket_name
+        self.bucket_name = bucket_name
         self.session = aioboto3.Session()
         self._client: BaseClient | None = None
         self._client_context = None
 
-        if not config.access_key:
-            raise ValueError("Access key is not set. Please specify it in the environment variable "
-                             "'{S3ObjectStoreClientConfig.ACCESS_KEY_ENV}'.")
+        self._client_args: dict = {}
+        if access_key and secret_key:
+            self._client_args["aws_access_key_id"] = access_key
+            self._client_args["aws_secret_access_key"] = secret_key
+        if region:
+            self._client_args["region_name"] = region
+        if endpoint_url:
+            self._client_args["endpoint_url"] = endpoint_url
 
-        if not config.secret_key:
-            raise ValueError("Secret key is not set. Please specify it in the environment variable "
-                             "'{S3ObjectStoreClientConfig.SECRET_KEY_ENV}'.")
-
-        self._client_args = {
-            "aws_access_key_id": config.access_key,
-            "aws_secret_access_key": config.secret_key,
-            "region_name": config.region,
-            "endpoint_url": config.endpoint_url
-        }
-
-    async def __aenter__(self):
+    async def __aenter__(self) -> "S3ObjectStore":
 
         if self._client_context is not None:
             raise RuntimeError("Connection already established")
@@ -79,7 +78,7 @@ class S3ObjectStore(ObjectStore):
 
         return self
 
-    async def __aexit__(self, exc_type, exc_value, traceback):
+    async def __aexit__(self, exc_type, exc_value, traceback) -> None:
 
         if self._client_context is None:
             raise RuntimeError("Connection not established")
@@ -112,11 +111,12 @@ class S3ObjectStore(ObjectStore):
         except ClientError as e:
             http_status_code = e.response.get("ResponseMetadata", {}).get("HTTPStatusCode", None)
             if http_status_code == 412:
-                raise KeyAlreadyExistsError(key=key,
-                                            additional_message=f"S3 object {self.bucket_name}/{key} already exists")
-            else:
-                # Other errors — rethrow or handle accordingly
-                raise
+                raise KeyAlreadyExistsError(
+                    key=key,
+                    additional_message=f"S3 object {self.bucket_name}/{key} already exists",
+                ) from e
+            # Other errors — rethrow or handle accordingly
+            raise
 
     async def upsert_object(self, key: str, item: ObjectStoreItem) -> None:
 
@@ -146,9 +146,8 @@ class S3ObjectStore(ObjectStore):
             return ObjectStoreItem(data=data, content_type=response['ContentType'], metadata=response['Metadata'])
         except ClientError as e:
             if e.response['Error']['Code'] == 'NoSuchKey':
-                raise NoSuchKeyError(key=key, additional_message=str(e))
-            else:
-                raise
+                raise NoSuchKeyError(key=key, additional_message=str(e)) from e
+            raise
 
     async def delete_object(self, key: str) -> None:
         if self._client is None:
@@ -158,9 +157,8 @@ class S3ObjectStore(ObjectStore):
             await self._client.get_object(Bucket=self.bucket_name, Key=key)
         except ClientError as e:
             if e.response['Error']['Code'] == 'NoSuchKey':
-                raise NoSuchKeyError(key=key, additional_message=str(e))
-            else:
-                raise
+                raise NoSuchKeyError(key=key, additional_message=str(e)) from e
+            raise
 
         results = await self._client.delete_object(Bucket=self.bucket_name, Key=key)
 

{nvidia_nat_s3-1.3.dev0.dist-info → nvidia_nat_s3-1.3.0rc1.dist-info}/METADATA

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-s3
-Version: 1.3.dev0
+Version: 1.3.0rc1
 Summary: Subpackage for S3-compatible integration in NeMo Agent toolkit
 Keywords: ai,agents,memory,data store
 Classifier: Programming Language :: Python
-Requires-Python: >=3.12
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: nvidia-nat==v1.3-dev
+Requires-Dist: nvidia-nat==v1.3.0-rc1
 Requires-Dist: aioboto3>=11.0.0

nvidia_nat_s3-1.3.0rc1.dist-info/RECORD

@@ -0,0 +1,9 @@
+nat/plugins/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nat/plugins/s3/object_store.py,sha256=FDcO_8j__Nb-W8IY7JeUk5WoCRIqVNi1a1L1aVmYt10,2172
+nat/plugins/s3/register.py,sha256=iBGq69m0rbZ3BTisA4Lt5UCHtW0Pc7m-l8G8dz-_pBc,813
+nat/plugins/s3/s3_object_store.py,sha256=_2Sx1QXosuS2FnHXtG8qo4x9-xTNJVbNxoiJCZQcWgE,6052
+nvidia_nat_s3-1.3.0rc1.dist-info/METADATA,sha256=TCgWe_eEwpkILu7wcSe0ESSD_rEEC5dDF7vW_JlykxY,506
+nvidia_nat_s3-1.3.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_s3-1.3.0rc1.dist-info/entry_points.txt,sha256=HSc9lsaEu-3DyVezRMR-VZrfhWnDtA9llVaWE2CYZNw,63
+nvidia_nat_s3-1.3.0rc1.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_s3-1.3.0rc1.dist-info/RECORD,,

nvidia_nat_s3-1.3.dev0.dist-info/RECORD

@@ -1,9 +0,0 @@
-nat/plugins/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nat/plugins/s3/object_store.py,sha256=yg-YBd4DgQC7MPIznuMfCNoW8XBeb5fpSS3Aj6bKr_Q,2134
-nat/plugins/s3/register.py,sha256=7gqnwyDrYttIlEaa7lo9AASYt-2GrZJE0YT2jpKjepo,845
-nat/plugins/s3/s3_object_store.py,sha256=jFWFS_Ocl5Mil_WPB-zfmfi6SflyTBGvRf5ib-uU5dw,6250
-nvidia_nat_s3-1.3.dev0.dist-info/METADATA,sha256=MF4nZ7bQIgW42_rZdNGOq0uADqqUVUJ4P6jM41dCkNM,345
-nvidia_nat_s3-1.3.dev0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat_s3-1.3.dev0.dist-info/entry_points.txt,sha256=HSc9lsaEu-3DyVezRMR-VZrfhWnDtA9llVaWE2CYZNw,63
-nvidia_nat_s3-1.3.dev0.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
-nvidia_nat_s3-1.3.dev0.dist-info/RECORD,,