rara-tools 0.4.2__tar.gz → 0.4.4__tar.gz

{rara_tools-0.4.2/rara_tools.egg-info → rara_tools-0.4.4}/PKG-INFO

@@ -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.4/VERSION

@@ -0,0 +1 @@
+0.4.4

{rara_tools-0.4.2 → rara_tools-0.4.4}/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-0.4.2 → rara_tools-0.4.4}/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 → rara_tools-0.4.4/rara_tools.egg-info}/PKG-INFO

@@ -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 → rara_tools-0.4.4}/tests/test_sierra_converters.py

@@ -44,25 +44,16 @@ example_res = {
 def test_convert_bibs_response():
 
     data = get_formatted_sierra_response("bibs.json")
-
+    
     expected = read_json_file(os.path.join(SIERRA_OUTPUT_DIR, "bibs.json"))
 
     assert compare_results(expected, data)
 
 
-def test_convert_keywords_response():
-
-    data = get_formatted_sierra_response("keywords.json")
-
-    expected = read_json_file(os.path.join(SIERRA_OUTPUT_DIR, "keywords.json"))
-
-    assert compare_results(expected, data)
-
-
 def test_convert_authorities_response():
 
     data = get_formatted_sierra_response("authorities.json")
-
+    
     expected = read_json_file(os.path.join(
         SIERRA_OUTPUT_DIR, "authorities.json"))
 

rara_tools-0.4.2/VERSION

@@ -1 +0,0 @@
-0.4.2