openforis-whisp 2.0.0a6__tar.gz → 2.0.0b1__tar.gz

{openforis_whisp-2.0.0a6 → openforis_whisp-2.0.0b1}/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 lecrabe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 lecrabe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{openforis_whisp-2.0.0a6 → openforis_whisp-2.0.0b1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: openforis-whisp
-Version: 2.0.0a6
+Version: 2.0.0b1
 Summary: Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations.
 License: MIT
 Keywords: whisp,geospatial,data-processing
 Author: Andy Arnell
-Author-email: and.arnell@fao.org
+Author-email: andrew.arnell@fao.org
 Requires-Python: >=3.10
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

{openforis_whisp-2.0.0a6 → openforis_whisp-2.0.0b1}/pyproject.toml

@@ -1,85 +1,85 @@
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry]
-name = "openforis-whisp"
-version = "2.0.0a6"
-description = "Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations."
-repository = "https://github.com/forestdatapartnership/whisp"
-authors = ["Andy Arnell <and.arnell@fao.org>"]
-readme = "README.md"
-license = "MIT"
-keywords = ["whisp", "geospatial", "data-processing"]
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Programming Language :: Python :: 3.10",
-    "License :: OSI Approved :: MIT License",
-    "Intended Audience :: Developers",
-    "Intended Audience :: Science/Research",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-[tool.poetry.urls]
-"Documentation" = "https://github.com/forestdatapartnership/whisp#readme"
-"Development Branch" = "https://github.com/forestdatapartnership/whisp/tree/main"
-"Issues" = "https://github.com/forestdatapartnership/whisp/issues"
-
-[tool.poetry.dependencies]
-python = ">=3.10"
-earthengine-api = "*"
-numpy = ">=1.21.0,<3.0.0"  # Updated version constraint
-pandas = ">=1.3.0,<3.0.0"
-pandera = {extras = ["io"], version = ">=0.22.1,<1.0.0"}
-country_converter = ">=0.7,<2.0.0"
-geojson = ">=2.5.0,<3.0.0"
-python-dotenv = ">=1.0.1,<2.0.0"
-pydantic-core = ">=2.14.0,<3.0.0"  # Updated version constraint
-rsa = ">=4.2,<5.0.0"  # Updated version constraint
-ipykernel = ">=6.17.1,<7.0.0"  # Compatible with Colab
-shapely = "^2.0.2"
-geopandas = "^1.0.1"
-
-[tool.poetry.group.dev.dependencies]
-pytest = ">=6.2.5,<7.0.0"
-pre-commit = ">=2.15.0,<3.0.0"
-ruff = ">=0.0.1,<1.0.0"
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-include-package-data = true
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.package-data]
-"whisp.parameters" = ["lookup_gee_datasets.csv", "lookup_context_and_metadata.csv"]
-
-[tool.pytest.ini_options]
-log_cli = true
-log_cli_level = "DEBUG"
-
-[tool.ruff]
-fix = true
-select = [
-    "A", "ANN", "ARG", "B", "C", "COM", "C90", "E", "ERA", "F", "I", "N", "PGH", "PL", "PLE", "PLR", "PLW", "PT",
-    "PTH", "Q", "RET", "RUF", "SLF", "SIM", "TID", "TRY", "UP", "W", "YTT"
-]
-ignore = [
-    "A003", "ANN002", "ANN003", "ANN101", "ANN102", "ANN401", "N805", "N818", "PLR0913", "RET504", "RET505"
-]
-fixable = [
-    "A", "ANN", "ARG", "B", "C", "COM", "C90", "E", "ERA", "F", "I", "PGH", "PL", "PLE", "PLR", "PLW", "PT",
-    "PTH", "Q", "RET", "RUF", "SLF", "SIM", "TID", "TRY", "UP", "W", "YTT"
-]
-unfixable = []
-
-exclude = [
-    ".bzr", ".direnv",
-]
-
-line-length = 120
-dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
-
-[tool.ruff.mccabe]
-max-complexity = 10
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "openforis-whisp"
+version = "2.0.0b1"
+description = "Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations."
+repository = "https://github.com/forestdatapartnership/whisp"
+authors = ["Andy Arnell <andrew.arnell@fao.org>"]
+readme = "README.md"
+license = "MIT"
+keywords = ["whisp", "geospatial", "data-processing"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python :: 3.10",
+    "License :: OSI Approved :: MIT License",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+[tool.poetry.urls]
+"Documentation" = "https://github.com/forestdatapartnership/whisp#readme"
+"Development Branch" = "https://github.com/forestdatapartnership/whisp/tree/main"
+"Issues" = "https://github.com/forestdatapartnership/whisp/issues"
+
+[tool.poetry.dependencies]
+python = ">=3.10"
+earthengine-api = "*"
+numpy = ">=1.21.0,<3.0.0"  # Updated version constraint
+pandas = ">=1.3.0,<3.0.0"
+pandera = {extras = ["io"], version = ">=0.22.1,<1.0.0"}
+country_converter = ">=0.7,<2.0.0"
+geojson = ">=2.5.0,<3.0.0"
+python-dotenv = ">=1.0.1,<2.0.0"
+pydantic-core = ">=2.14.0,<3.0.0"  # Updated version constraint
+rsa = ">=4.2,<5.0.0"  # Updated version constraint
+ipykernel = ">=6.17.1,<7.0.0"  # Compatible with Colab
+shapely = "^2.0.2"
+geopandas = "^1.0.1"
+
+[tool.poetry.group.dev.dependencies]
+pytest = ">=6.2.5,<7.0.0"
+pre-commit = ">=2.15.0,<3.0.0"
+ruff = ">=0.0.1,<1.0.0"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"whisp.parameters" = ["lookup_gee_datasets.csv", "lookup_context_and_metadata.csv"]
+
+[tool.pytest.ini_options]
+log_cli = true
+log_cli_level = "DEBUG"
+
+[tool.ruff]
+fix = true
+select = [
+    "A", "ANN", "ARG", "B", "C", "COM", "C90", "E", "ERA", "F", "I", "N", "PGH", "PL", "PLE", "PLR", "PLW", "PT",
+    "PTH", "Q", "RET", "RUF", "SLF", "SIM", "TID", "TRY", "UP", "W", "YTT"
+]
+ignore = [
+    "A003", "ANN002", "ANN003", "ANN101", "ANN102", "ANN401", "N805", "N818", "PLR0913", "RET504", "RET505"
+]
+fixable = [
+    "A", "ANN", "ARG", "B", "C", "COM", "C90", "E", "ERA", "F", "I", "PGH", "PL", "PLE", "PLR", "PLW", "PT",
+    "PTH", "Q", "RET", "RUF", "SLF", "SIM", "TID", "TRY", "UP", "W", "YTT"
+]
+unfixable = []
+
+exclude = [
+    ".bzr", ".direnv",
+]
+
+line-length = 120
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[tool.ruff.mccabe]
+max-complexity = 10

{openforis_whisp-2.0.0a6 → openforis_whisp-2.0.0b1}/src/openforis_whisp/__init__.py

@@ -1,75 +1,74 @@
-import ee
-from google.oauth2 import service_account
-
-
-def initialize_ee(credentials_path=None):
-    """Initializes Google Earth Engine using the provided path or defaults to normal if no path is given."""
-    try:
-        if not ee.data._initialized:
-            print(credentials_path)
-            if credentials_path:
-                credentials = service_account.Credentials.from_service_account_file(
-                    credentials_path,
-                    scopes=["https://www.googleapis.com/auth/earthengine"],
-                )
-                ee.Initialize(credentials)
-                print("EE initialized with credentials from:", credentials_path)
-            else:
-                ee.Initialize()
-                print("EE initialized with default credentials.")
-    except Exception as e:
-        print("Error initializing EE:", e)
-
-
-# Default to normal initialize if nobody calls whisp.initialize_ee.
-try:
-    if not ee.data._initialized:
-        ee.Initialize()
-        print("EE auto-initialized with default credentials.")
-except Exception as e:
-    print("Error in default EE initialization:", e)
-
-from openforis_whisp.datasets import (
-    combine_datasets,
-)
-
-from openforis_whisp.stats import (
-    whisp_stats_ee_to_ee,
-    whisp_stats_ee_to_df,
-    whisp_stats_geojson_to_df,
-    whisp_stats_geojson_to_ee,
-    whisp_stats_geojson_to_geojson,
-    whisp_stats_ee_to_drive,
-    whisp_stats_geojson_to_drive,
-    whisp_formatted_stats_ee_to_df,
-    whisp_formatted_stats_ee_to_geojson,
-    whisp_formatted_stats_geojson_to_df,
-    whisp_formatted_stats_geojson_to_geojson,
-    convert_iso3_to_iso2,
-)
-
-# temporary parameters to be removed once isio3 to iso2 conversion server side is implemented
-from openforis_whisp.parameters.config_runtime import (
-    iso3_country_column,
-    iso2_country_column,
-)
-
-from openforis_whisp.reformat import (
-    validate_dataframe_using_lookups,
-    validate_dataframe,
-    create_schema_from_dataframe,
-    load_schema_if_any_file_changed,
-    # log_missing_columns,
-)
-
-from openforis_whisp.data_conversion import (
-    convert_ee_to_df,
-    convert_geojson_to_ee,
-    convert_df_to_geojson,
-    convert_csv_to_geojson,
-    convert_ee_to_geojson,
-)
-
-from openforis_whisp.risk import whisp_risk, detect_unit_type
-
-from openforis_whisp.utils import get_example_data_path
+import ee
+from google.oauth2 import service_account
+
+
+def initialize_ee(credentials_path=None):
+    """Initializes Google Earth Engine using the provided path or defaults to normal if no path is given."""
+    try:
+        if not ee.data._initialized:
+            print(credentials_path)
+            if credentials_path:
+                credentials = service_account.Credentials.from_service_account_file(
+                    credentials_path,
+                    scopes=["https://www.googleapis.com/auth/earthengine"],
+                )
+                ee.Initialize(credentials)
+                print("EE initialized with credentials from:", credentials_path)
+            else:
+                ee.Initialize()
+                print("EE initialized with default credentials.")
+    except Exception as e:
+        print("Error initializing EE:", e)
+
+
+# Default to normal initialize if nobody calls whisp.initialize_ee.
+try:
+    if not ee.data._initialized:
+        ee.Initialize()
+        print("EE auto-initialized with default credentials.")
+except Exception as e:
+    print("Error in default EE initialization:", e)
+
+from openforis_whisp.datasets import combine_datasets, combine_custom_bands
+
+from openforis_whisp.stats import (
+    whisp_stats_ee_to_ee,
+    whisp_stats_ee_to_df,
+    whisp_stats_geojson_to_df,
+    whisp_stats_geojson_to_ee,
+    whisp_stats_geojson_to_geojson,
+    whisp_stats_ee_to_drive,
+    whisp_stats_geojson_to_drive,
+    whisp_formatted_stats_ee_to_df,
+    whisp_formatted_stats_ee_to_geojson,
+    whisp_formatted_stats_geojson_to_df,
+    whisp_formatted_stats_geojson_to_geojson,
+    convert_iso3_to_iso2,
+)
+
+# temporary parameters to be removed once isio3 to iso2 conversion server side is implemented
+from openforis_whisp.parameters.config_runtime import (
+    iso3_country_column,
+    iso2_country_column,
+)
+
+from openforis_whisp.reformat import (
+    validate_dataframe_using_lookups,
+    validate_dataframe_using_lookups_flexible,
+    validate_dataframe,
+    create_schema_from_dataframe,
+    load_schema_if_any_file_changed,
+    # log_missing_columns,
+)
+
+from openforis_whisp.data_conversion import (
+    convert_ee_to_df,
+    convert_geojson_to_ee,
+    convert_df_to_geojson,
+    convert_csv_to_geojson,
+    convert_ee_to_geojson,
+)
+
+from openforis_whisp.risk import whisp_risk, detect_unit_type
+
+from openforis_whisp.utils import get_example_data_path