rara-tools 0.0.12__py3-none-any.whl → 0.1.0__py3-none-any.whl

rara_tools/constants/digitizer.py

@@ -1,4 +1,12 @@
+COMPONENT_KEY = "digitizer"
+
+
+class ModelTypes:
+    IMAGE_PROCESSOR = "image_processor"
+
+
 class StatusKeys:
+    DOWNLOAD_MODELS = "digitizer_download_models"
     CLEAN_UP = "digitizer_clean_up"
     ELASTICSEARCH_UPLOAD = "digitizer_elasticsearch_upload"
     UPLOAD = "s3_upload"
@@ -11,3 +19,7 @@ class Queue:
     DOWNLOAD = "download"
     FINISH = "finish"
     OCR = "ocr"
+
+
+class Tasks:
+    MODEL_UPDATE = "component_model_update"

rara_tools/constants/general.py

@@ -1,4 +1,5 @@
 class Status:
+    SKIPPED = "SKIPPED"
     FAILED = "FAILED"
     PENDING = "PENDING"
     RUNNING = "RUNNING"

rara_tools/converters.py

@@ -2,40 +2,80 @@ from .exceptions import SierraResponseConverterException
 
 
 class SierraResponseConverter:
-    """  Takes a JSON response from the Sierra API (https://tester.ester.ee/iii/sierra-api/swagger/index.html)
-    and converts it to MARC-in-JSON format.
-    
-    """
+    """Converts a JSON response from the Sierra API to MARC-in-JSON format."""
     
     def __init__(self, response: dict):
         if not isinstance(response, dict):
             raise SierraResponseConverterException("Please provide a valid JSON response.")
         self.response = response
+    
+    def _map_control_fields(self, field: dict) -> dict:
+        # for tags < 010, no subfields, instead one str value in "value" 
+        return {field["tag"]: field["value"]}
+    
+    def _map_data_fields(self, field: dict) -> dict:
+        """ Maps marc fields > 010. 
+
+        Args:
+            field (dict): Contains the marc tag and list with indicators and subfields.
+
+        Returns:
+            dict: standardised marc-in-json format.
+        """
+        
+        data = field["data"]
+        
+        # Order matters ind1, in2, subfields
+        field_data = {
+            "ind1": data.get("ind1", " "),
+            "ind2": data.get("ind2", " "),
+            "subfields": data.get("subfields", [])
+        }
+        
+        return {field["tag"]: field_data}
+    
+    def _is_marc21structured(self, field: dict) -> bool:
+        """Checks if the field is already structured according to MARC21 in JSON"""
+        return any(key.isdigit() for key in field.keys())
+        
+    
+    def _handle_field_type(self, field: dict) -> dict:
+        
+        if self._is_marc21structured(field):
+            return field
+        
+        if field.get("data"):
+            return self._map_data_fields(field)
         
-    def _map_field_data(self, field):
         tag = field.get("tag")
+        
         if not tag:
-            raise SierraResponseConverterException("Field is missing a valid 'tag'.")
-        data = field.get("data", {})
-        return {tag: data}
+            raise SierraResponseConverterException("Field is missing MARC21 tag.")
         
-    def _convert_response(self):
-        response = self.response
+        if tag < "010":
+            return self._map_control_fields(field)
+        else:
+            return self._map_data_fields(field)
         
-        entries = response.get("entries")
+    def _convert_response(self) -> list:
+        entries = self.response.get("entries")
         if not entries:
             raise SierraResponseConverterException("No entries found in the response.")
         
         try:
-            fields = [self._map_field_data(f) for e in entries for f in e["marc"]["fields"]]
+            return {"fields": [
+                {e["id"]: [
+                    self._handle_field_type(f) for f in e["marc"]["fields"]
+                    ]}
+                for e in entries
+            ]}
+            
         except KeyError as e:
-            raise SierraResponseConverterException(f"Missing expected MARC fields in the response: {e}")
+            raise SierraResponseConverterException(f"Malformed response: missing key {e}")
         
-        return {"fields": fields}
-            
-    def convert(self):
-        """Runner method, converts the response to MARC-in-JSON format with error handling."""
+    
+    def convert(self) -> list:
         try:
             return self._convert_response()
         except Exception as e:
-            raise SierraResponseConverterException(f"An unexpected error occurred during conversion: {e}")
+            raise SierraResponseConverterException(f"An unexpected error occurred: {e}")

rara_tools/exceptions.py

@@ -7,6 +7,10 @@ class S3InitException(Exception):
 class S3ConnectionException(Exception):
     """Raised S3 Bucket/Connection Error."""
 
+class S3DownloadException(Exception):
+    """Raised S3 Download Error."""
+
+
 class ElasticsearchException(Exception):
     """Raised Elasticsearch Error."""
 

rara_tools/s3.py

@@ -1,11 +1,20 @@
+import logging
 import os
+import pathlib
+import time
 import uuid
 from typing import Any, Generator, List, Optional
 
-from minio import Minio
+from minio import Minio, S3Error
 
-from .exceptions import (S3ConnectionException, S3InitException,
-                         S3InputException)
+from .exceptions import (
+    S3ConnectionException,
+    S3InitException,
+    S3InputException,
+    S3DownloadException
+)
+
+logger = logging.getLogger("tools.s3")
 
 
 class S3Files:
@@ -76,9 +85,49 @@ class S3Files:
         list_of_objects = list(self.minio_client.list_objects(self.bucket, prefix=path, recursive=True))
         for minio_object in list_of_objects:
             full_path = os.path.join(download_dir, minio_object.object_name)
-            self.minio_client.fget_object(self.bucket, minio_object.object_name, full_path)
+            self._download_file(minio_object.object_name, full_path)
             yield full_path
 
+    def _download_file(self, path, download_dir=".", max_retries=3) -> str:
+        """Download a single file with retry and resume support."""
+        attempts = 0
+
+        while attempts < max_retries:
+            try:
+                stat = self.minio_client.stat_object(self.bucket, path)
+                file_size = stat.size
+                temp_path = download_dir + ".part"
+                pathlib.Path(temp_path).parent.mkdir(parents=True, exist_ok=True)
+
+                # Check if a partial file exists
+                downloaded_size = os.path.getsize(temp_path) if os.path.exists(temp_path) else 0
+
+                if downloaded_size >= file_size:
+                    os.rename(temp_path, download_dir)  # Rename to final filename
+                    logger.info(f"Completed: {path}")
+                    return str(pathlib.Path(download_dir) / path)
+
+                logger.info(f"Downloading {path} ({downloaded_size}/{file_size} bytes)...")
+
+                # Open file in append mode to resume download
+                with open(temp_path, "ab") as f:
+                    response = self.minio_client.get_object(self.bucket, path, offset=downloaded_size)
+                    for data in response.stream(32 * 1024):  # 32KB chunks
+                        f.write(data)
+                    response.close()
+                    response.release_conn()
+
+                os.rename(temp_path, download_dir)  # Rename temp to final
+                logger.info(f"Downloaded: {path}")
+                return str(pathlib.Path(download_dir) / path)
+
+            except S3Error as e:
+                logger.info(f"Error downloading {path}, attempt {attempts + 1}: {e}")
+                attempts += 1
+                time.sleep(2 ** attempts)  # Exponential backoff
+
+        raise S3DownloadException(f"Failed to download {path} after {max_retries} attempts.")
+
     def upload(self, path: str, prefix: Optional[str] = "") -> str:
         """Uploads file or folder to S3 bucket.
         :param: path str: Path to the file to upload in local file system.

{rara_tools-0.0.12.dist-info → rara_tools-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rara-tools
-Version: 0.0.12
+Version: 0.1.0
 Summary: Tools to support Kata's work.
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -18,6 +18,7 @@ Requires-Dist: iso639-lang
 Provides-Extra: testing
 Requires-Dist: pytest>=8.0; extra == "testing"
 Requires-Dist: pytest-order; extra == "testing"
+Dynamic: license-file
 
 # RaRa Tools
 

rara_tools-0.1.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+rara_tools/converters.py,sha256=O769zNjde1VCfEUF2VU_49IAbm8NT-cG-VR0uPxixtE,2687
+rara_tools/decorators.py,sha256=MjOyvZ5nTkwxwx2JLFEGpKKBysvecFw6EN6UDrSvZLU,2187
+rara_tools/digar_schema_converter.py,sha256=k95U2iRlEA3sh772-v6snhHW6fju6qSTMnvWJ6DpzZk,14254
+rara_tools/elastic.py,sha256=MgPHxZ3UbSTIL8_sT9gU5V4PLKJjo3aQ8CGyhXjRz6M,13065
+rara_tools/exceptions.py,sha256=YQyaueUbXeTkJYFDEuN6iWTXMI3eCv5l7PxGp87vg5I,550
+rara_tools/s3.py,sha256=9ziDXsLjBtFAvsjTPxFddhfvkpA8773rzPJqO7y1N5Q,6415
+rara_tools/task_reporter.py,sha256=WCcZts9dAUokPc4vbrG3-lNAFLnWaMgE3b3iaUB7mr8,3256
+rara_tools/utils.py,sha256=9vSbmuWYU5ydr4lXBKlUKa0xzDccFsaJv4T-XwgUfuY,2578
+rara_tools/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rara_tools/constants/digitizer.py,sha256=MND0dUQySBAOVWzuUBxQGZWv_Ckdz2jCp25F2_oHGi8,496
+rara_tools/constants/general.py,sha256=aVUQTMss89atAkTDZKJXNdnsBHPX-RSrlBOtt-wdPGU,195
+rara_tools-0.1.0.dist-info/licenses/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
+rara_tools-0.1.0.dist-info/METADATA,sha256=TM89xbTBJiyz3ZNXbYzLwYi84ChYLDN9Lyo2XZ-posE,3916
+rara_tools-0.1.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rara_tools-0.1.0.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
+rara_tools-0.1.0.dist-info/RECORD,,

{rara_tools-0.0.12.dist-info → rara_tools-0.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rara_tools-0.0.12.dist-info/RECORD

@@ -1,16 +0,0 @@
-rara_tools/converters.py,sha256=JcS74VzV6jm12l3C6aqMJBY9nuVW_aevQeCe32KmfrE,1576
-rara_tools/decorators.py,sha256=MjOyvZ5nTkwxwx2JLFEGpKKBysvecFw6EN6UDrSvZLU,2187
-rara_tools/digar_schema_converter.py,sha256=k95U2iRlEA3sh772-v6snhHW6fju6qSTMnvWJ6DpzZk,14254
-rara_tools/elastic.py,sha256=MgPHxZ3UbSTIL8_sT9gU5V4PLKJjo3aQ8CGyhXjRz6M,13065
-rara_tools/exceptions.py,sha256=BwNh4qWxau_ylr9RqZoYwd1KnExI6oWWWDno3jkh8q4,474
-rara_tools/s3.py,sha256=uNDu2HzMYHAWh33RcHeyPFK7gdQfQPxsdfohyIKezEY,4467
-rara_tools/task_reporter.py,sha256=WCcZts9dAUokPc4vbrG3-lNAFLnWaMgE3b3iaUB7mr8,3256
-rara_tools/utils.py,sha256=9vSbmuWYU5ydr4lXBKlUKa0xzDccFsaJv4T-XwgUfuY,2578
-rara_tools/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rara_tools/constants/digitizer.py,sha256=gJ3jOMwuZfKcLqgOAxTyB266VYsskLabJiMUiSz3xX4,297
-rara_tools/constants/general.py,sha256=E9Jaw-YxocS_tOZw9QBoxO3e9KK5EMbLoM0R7D4Iflw,171
-rara_tools-0.0.12.dist-info/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
-rara_tools-0.0.12.dist-info/METADATA,sha256=Sz4qM5x__70ANb98HsgCjNjwEsKSumaUcbpGSk5Tfcw,3895
-rara_tools-0.0.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rara_tools-0.0.12.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
-rara_tools-0.0.12.dist-info/RECORD,,