airbyte-source-s3 4.14.0.dev202504091813__py3-none-any.whl → 4.14.0.dev202504161719__py3-none-any.whl

{airbyte_source_s3-4.14.0.dev202504091813.dist-info → airbyte_source_s3-4.14.0.dev202504161719.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: airbyte-source-s3
-Version: 4.14.0.dev202504091813
+Version: 4.14.0.dev202504161719
 Summary: Source implementation for S3.
 License: ELv2
 Author: Airbyte
@@ -10,7 +10,7 @@ Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: airbyte-cdk[file-based] (==6.45.0.dev04107)
+Requires-Dist: airbyte-cdk[file-based] (==6.45.4.post49.dev14495925594)
 Requires-Dist: dill (>=0.3.4,<0.4.0)
 Requires-Dist: pendulum (>=3.0.0,<4.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)

{airbyte_source_s3-4.14.0.dev202504091813.dist-info → airbyte_source_s3-4.14.0.dev202504161719.dist-info}/RECORD

@@ -17,9 +17,9 @@ source_s3/v4/config.py,sha256=v9upt0VvzRT2m50Ym8yS2E1F0hNzP21m3zzo7cAG0Wk,4271
 source_s3/v4/cursor.py,sha256=kZj_6Wtl2yVAVeKZW67XyYQOk2XtbYazTgswEgGfKnI,7298
 source_s3/v4/legacy_config_transformer.py,sha256=OjKwGBYPHZvhZRKGO1LOAR7-cAT-9KvDRQY-G93eoic,7840
 source_s3/v4/source.py,sha256=jugIY53C_G9QhQRwKWBPcXXUgYKF_RESSaewzF_HXhc,8967
-source_s3/v4/stream_reader.py,sha256=qoCHJ0uxUqjaBYVo5TKy945ZPVjtlEs2ucGaKI6ZTKM,16320
+source_s3/v4/stream_reader.py,sha256=moJTzT-gZI5X4LmRfDe8Ek5ekbKxjiZxiaHUyk6e-w4,16836
 source_s3/v4/zip_reader.py,sha256=5Atoxu3Si0w5fNT6l_qQ-C1ZlKYt2DgV4Lxf8tTU5hw,14608
-airbyte_source_s3-4.14.0.dev202504091813.dist-info/METADATA,sha256=DqL0tW1qRzp-0UIgJJ76i6P1RABkhQbMWk_0P3N_v4I,5402
-airbyte_source_s3-4.14.0.dev202504091813.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-airbyte_source_s3-4.14.0.dev202504091813.dist-info/entry_points.txt,sha256=1ndXy1aXftjfCR82yLKg797X8-O5mD95tz6rNKA_1dE,47
-airbyte_source_s3-4.14.0.dev202504091813.dist-info/RECORD,,
+airbyte_source_s3-4.14.0.dev202504161719.dist-info/METADATA,sha256=ZpYgAooKRjEFpnDGXwDu3BLoG0LVZftqABhkHdK5IIU,5415
+airbyte_source_s3-4.14.0.dev202504161719.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+airbyte_source_s3-4.14.0.dev202504161719.dist-info/entry_points.txt,sha256=1ndXy1aXftjfCR82yLKg797X8-O5mD95tz6rNKA_1dE,47
+airbyte_source_s3-4.14.0.dev202504161719.dist-info/RECORD,,

source_s3/v4/stream_reader.py

@@ -168,6 +168,19 @@ class SourceS3StreamReader(AbstractFileBasedStreamReader):
             endpoint=self.config.endpoint,
         ) from exc
 
+    def _construct_s3_uri(self, file: RemoteFile) -> str:
+        """
+        Constructs the S3 URI for a given file, handling both regular files and files inside archives.
+
+        Args:
+            file: The RemoteFile object representing either a regular file or a file inside an archive
+
+        Returns:
+            str: The properly formatted S3 URI
+        """
+        file_path = file.uri.split("#")[0] if isinstance(file, RemoteFileInsideArchive) else file.uri
+        return f"s3://{self.config.bucket}/{file_path}"
+
     def open_file(self, file: RemoteFile, mode: FileReadMode, encoding: Optional[str], logger: logging.Logger) -> IOBase:
         try:
             params = {"client": self.s3_client}
@@ -176,14 +189,13 @@ class SourceS3StreamReader(AbstractFileBasedStreamReader):
 
         logger.debug(f"try to open {file.uri}")
         try:
+            s3_uri = self._construct_s3_uri(file)
             if isinstance(file, RemoteFileInsideArchive):
-                s3_file_object = smart_open.open(f"s3://{self.config.bucket}/{file.uri.split('#')[0]}", transport_params=params, mode="rb")
+                s3_file_object = smart_open.open(s3_uri, transport_params=params, mode="rb")
                 decompressed_stream = DecompressedStream(s3_file_object, file)
                 result = ZipContentReader(decompressed_stream, encoding)
             else:
-                result = smart_open.open(
-                    f"s3://{self.config.bucket}/{file.uri}", transport_params=params, mode=mode.value, encoding=encoding
-                )
+                result = smart_open.open(s3_uri, transport_params=params, mode=mode.value, encoding=encoding)
         except OSError:
             logger.warning(
                 f"We don't have access to {file.uri}. The file appears to have become unreachable during sync."
@@ -247,7 +259,7 @@ class SourceS3StreamReader(AbstractFileBasedStreamReader):
             message = "File size exceeds the 1 GB limit."
             raise FileSizeLimitError(message=message, internal_message=message, failure_type=FailureType.config_error)
 
-        file_paths = self._get_file_transfer_paths(file, local_directory)
+        file_paths = self._get_file_transfer_paths(file.uri, local_directory)
         local_file_path = file_paths[self.LOCAL_FILE_PATH]
         file_relative_path = file_paths[self.FILE_RELATIVE_PATH]
         file_name = file_paths[self.FILE_NAME]
@@ -267,6 +279,7 @@ class SourceS3StreamReader(AbstractFileBasedStreamReader):
             filename=file_name,
             bytes=file_size,
             updated_at=file.last_modified.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
+            source_uri=self._construct_s3_uri(file),
         )
 
         file_reference = AirbyteRecordMessageFileReference(