Merge pull request #15 from TaskarCenterAtUW/develop

Develop to Main for version 0.2.2

Author: sujata-m

.github/workflows/unit_tests.yml

@@ -0,0 +1,27 @@
+---
+    name: Tests
+    on:
+      pull_request:
+        branches: [develop]
+
+    jobs:
+      Tests:
+        name: Unit tests
+        # Set the agent to run on
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout code
+            uses: actions/checkout@v3
+
+          - name: Set up Python
+            uses: actions/setup-python@v4
+            with:
+              python-version: "3.10"
+
+          - name: Install dependencies
+            run: |
+              pip install -r requirements.txt
+
+          - name: Run unit tests
+            run: |
+              python -m unittest discover -v tests/unit_tests

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+### 0.2.2
+- Added functionality to get the specific number of errors
+  ```
+  validator = OSWValidation(zipfile_path=<ZIP_FILE_PATH>)
+  result = validator.validate() // will return only first 20 errors by default
+  result = validator.validate(max_errors=10) // will return only first 10 errors
+  ```
+
 ### 0.2.1
 - Updated zipfile_handler
 - Fixed "No .geojson files found in the specified directory or its subdirectories." issue

README.md

@@ -28,9 +28,13 @@ This package validates the OSW geojson file. Package requires a OSW zip file pat
 from python_osw_validation import OSWValidation
 
 validator = OSWValidation(zipfile_path='<Zip file path>')
-result = validator.validate()
+result = validator.validate()  
 print(result.is_valid)
-print(result.errors)
+print(result.errors) # will return first 20 errors by default if there are errors
+
+result = validator.validate(max_errors=10)  
+print(result.is_valid)
+print(result.errors) # will return first 10 errors depending on the max_errors parameter
 
 ```
 

src/python_osw_validation/__init__.py

@@ -45,7 +45,7 @@ def are_ids_unique(self, gdf):
 
         return is_valid, list(duplicates)
 
-    def validate(self) -> ValidationResult:
+    def validate(self, max_errors=20) -> ValidationResult:
         try:
             # Extract the zipfile
             zip_handler = ZipFileHandler(self.zipfile_path)
@@ -62,7 +62,8 @@ def validate(self) -> ValidationResult:
                 return ValidationResult(False, self.errors)
             for file in validator.files:
                 file_path = os.path.join(file)
-                is_valid = self.validate_osw_errors(file_path)
+                if not self.validate_osw_errors(file_path, max_errors):
+                    break
 
             if self.errors:
                 zip_handler.remove_extracted_files()
@@ -119,7 +120,7 @@ def validate(self) -> ValidationResult:
 
             # Geometry validation: check geometry type in each file and test if coordinates make a shape that is reasonable geometric shape according to the Simple Feature Access standard
             for osw_file in OSW_dataset:
-                invalid_geojson = OSW_dataset[osw_file][(OSW_dataset[osw_file].geometry.type != OSW_dataset_files[osw_file]['geometry']) | (OSW_dataset[osw_file].is_valid==False)]
+                invalid_geojson = OSW_dataset[osw_file][(OSW_dataset[osw_file].geometry.type != OSW_dataset_files[osw_file]['geometry']) | (OSW_dataset[osw_file].is_valid == False)]
                 is_valid = len(invalid_geojson) == 0
                 if not is_valid:
                     self.errors.append(f"Invalid {osw_file} geometries found, id's of invalid geometries: {set(invalid_geojson['_id'])}")
@@ -128,7 +129,7 @@ def validate(self) -> ValidationResult:
             for file in validator.externalExtensions:
                 file_path = os.path.join(file)
                 extensionFile = gpd.read_file(file_path)
-                invalid_geojson = extensionFile[extensionFile.is_valid==False]
+                invalid_geojson = extensionFile[extensionFile.is_valid == False]
                 is_valid = len(invalid_geojson) == 0
                 if not is_valid:
                     self.errors.append(f"Invalid geometries found in extension file {file}, list of invalid geometries: {invalid_geojson.to_json()}")
@@ -147,14 +148,17 @@ def load_osw_file(self, graph_geojson_path: str) -> Dict[str, Any]:
         with open(graph_geojson_path, 'r') as file:
             return json.load(file)
 
-    def validate_osw_errors(self, file_path: str) -> bool:
+    def validate_osw_errors(self, file_path: str, max_errors: int) -> bool:
         '''Validate OSW Data against the schema and process all errors'''
         geojson_data = self.load_osw_file(file_path)
         validator = jsonschema.Draft7Validator(self.load_osw_schema(self.schema_file_path))
         errors = list(validator.iter_errors(geojson_data))
 
         if errors:
-            for error in errors:
-                self.errors.append(f'Validation error: {error.message}')
+            for index, error in enumerate(errors):
+                if index < max_errors:
+                    self.errors.append(f'Validation error: {error.message}')
+                    if len(self.errors) == max_errors:
+                        break
             return False
         return True

src/python_osw_validation/version.py

@@ -1 +1 @@
-__version__ = '0.2.1'
+__version__ = '0.2.2'

tests/unit_tests/test_osw_validation.py

@@ -76,6 +76,20 @@ def test_invalid_zipfile_with_schema(self):
         self.assertFalse(result.is_valid)
         self.assertIsNotNone(result.errors)
 
+    def test_invalid_zipfile_default_error_count(self):
+        validation = OSWValidation(zipfile_path=self.invalid_zipfile)
+        result = validation.validate()
+        self.assertFalse(result.is_valid)
+        self.assertIsNotNone(result.errors)
+        self.assertLessEqual(len(result.errors), 20)
+
+    def test_invalid_zipfile_should_specific_errors_counts(self):
+        validation = OSWValidation(zipfile_path=self.invalid_zipfile)
+        result = validation.validate(max_errors=10)
+        self.assertFalse(result.is_valid)
+        self.assertIsNotNone(result.errors)
+        self.assertLessEqual(len(result.errors), 10)
+
     def test_invalid_zipfile_with_invalid_schema(self):
         validation = OSWValidation(zipfile_path=self.invalid_zipfile,
                                        schema_file_path=self.invalid_schema_file_path)