rara-tools 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

rara_tools/converters.py

@@ -14,9 +14,46 @@ class SierraResponseConverter:
     def _map_control_fields(field: dict) -> dict:
         # for tags < 010, no subfields, instead one str value in "value"
         return {field["tag"]: field["value"]}
+    
+    def _map_data_field_subfields(self, subfields: list) -> list:
+        """ Maps data field subfields to the standardised format, if necessary.
 
-    @staticmethod
-    def _map_data_fields(field: dict) -> dict:
+        Args:
+            subfields (list): List of subfields in format e.g
+              "subfields": [
+                        {
+                            "code": "a",
+                            "data": "foo"
+                        }, 
+                        {
+                            "code": "c",
+                            "data": "by me."
+                        }
+                    ]
+
+        Returns:
+            list: standardised marc-in-json format. e.g 
+             "subfields": [
+                            { "a": "foo /" },
+                            { "c": "by me." }
+                                ]
+        """
+        result = []
+        for subfield in subfields:
+            
+            code = subfield.get("code")
+            data = subfield.get("data")
+
+            if not code or not data:
+                # assume that the subfield is already in the correct format
+                return subfields
+            else:
+                result.append({code: data})
+                
+        return result
+
+
+    def _map_data_fields(self, field: dict) -> dict:
         """ Maps marc fields > 010. 
 
         Args:
@@ -27,12 +64,13 @@ class SierraResponseConverter:
         """
 
         data = field["data"]
+        subfields = data.get("subfields", [])
 
         # Order matters ind1, in2, subfields
         field_data = {
             "ind1": data.get("ind1", " "),
             "ind2": data.get("ind2", " "),
-            "subfields": data.get("subfields", [])
+            "subfields": self._map_data_field_subfields(subfields)
         }
 
         return {field["tag"]: field_data}
@@ -41,7 +79,7 @@ class SierraResponseConverter:
     def _is_marc21structured(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):

rara_tools/elastic.py

@@ -203,6 +203,17 @@ class KataElastic:
         actions = [{"_index": last_index_name, "_source": document} for document in documents]
         successful_count, error_count = bulk(actions=actions, client=self.elasticsearch, max_retries=3, refresh=refresh)
         return successful_count, error_count
+    
+    @_elastic_connection
+    def bulk_index_without_rollver(
+            self,
+            documents: Iterator[dict],
+            index: str,
+            refresh="false",
+    ) -> (int, int):
+        actions = [{"_index": index, "_source": document} for document in documents]
+        successful_count, error_count = bulk(actions=actions, client=self.elasticsearch, max_retries=3, refresh=refresh)
+        return successful_count, error_count
 
     @_elastic_connection
     def index_document(self, index: str, body: dict, document_id: Optional[str] = None) -> Dict:

{rara_tools-0.4.2.dist-info → rara_tools-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rara-tools
-Version: 0.4.2
+Version: 0.4.4
 Summary: Tools to support Kata's work.
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{rara_tools-0.4.2.dist-info → rara_tools-0.4.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-rara_tools/converters.py,sha256=_1ZRH4ACLOolI1G5b_aSssN68rWOvan-q2dTq7D7-j4,2794
+rara_tools/converters.py,sha256=a1dEMa0TwcO9UmjuSBkiuc7LGmH0d_dB6wwoTLpdZhI,4040
 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/elastic.py,sha256=dw61Z6SxhItNqN35m_3UBy41ppRMhBQLqYriZRo6zGA,13513
 rara_tools/exceptions.py,sha256=YQyaueUbXeTkJYFDEuN6iWTXMI3eCv5l7PxGp87vg5I,550
 rara_tools/s3.py,sha256=9ziDXsLjBtFAvsjTPxFddhfvkpA8773rzPJqO7y1N5Q,6415
 rara_tools/task_reporter.py,sha256=WCcZts9dAUokPc4vbrG3-lNAFLnWaMgE3b3iaUB7mr8,3256
@@ -31,8 +31,8 @@ rara_tools/parsers/marc_records/title_record.py,sha256=0FnX1kl9InELlSqMGECjswEbh
 rara_tools/parsers/tools/entity_normalizers.py,sha256=afOMqJoL4aeq0cfsohIuxkxzvqNdZ_ba7U32eyogbzk,8722
 rara_tools/parsers/tools/marc_converter.py,sha256=PUbggzJ_wHfke_bHTF2LOZyzX1t0wRM8qIFL36Dl3AI,414
 rara_tools/parsers/tools/russian_transliterator.py,sha256=5ZU66iTqAhr7pmfVqXPAI_cidF43VqqmuN4d7H4_JuA,9770
-rara_tools-0.4.2.dist-info/licenses/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
-rara_tools-0.4.2.dist-info/METADATA,sha256=U1kkRCHyi5F--mlc9Vs9qEGihWDIDxtxd0YhgmFoSAg,4054
-rara_tools-0.4.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rara_tools-0.4.2.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
-rara_tools-0.4.2.dist-info/RECORD,,
+rara_tools-0.4.4.dist-info/licenses/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
+rara_tools-0.4.4.dist-info/METADATA,sha256=mUnO4FnBrYwmUWwx2ukdsg4SD7pfVWBhd3r7RTv1iYU,4054
+rara_tools-0.4.4.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+rara_tools-0.4.4.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
+rara_tools-0.4.4.dist-info/RECORD,,

{rara_tools-0.4.2.dist-info → rara_tools-0.4.4.dist-info}/WHEEL

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