Merge branch 'main' of https://github.com/zalf-rpm/mas_python_common

Author: bergm

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.1.29"
+  ".": "0.1.30"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.30](https://github.com/zalf-rpm/mas_python_common/compare/v0.1.29...v0.1.30) (2025-09-11)
+
+
+### Features
+
+* new import logic ([#10](https://github.com/zalf-rpm/mas_python_common/issues/10)) ([ac97e69](https://github.com/zalf-rpm/mas_python_common/commit/ac97e69a512e143ffd0f3be0ec66383dc8ad97a7))
+
 ## [0.1.29](https://github.com/zalf-rpm/mas_python_common/compare/v0.1.28...v0.1.29) (2025-08-29)
 
 

poetry.lock

@@ -1,6 +1,6 @@
 [project]
 name = "zalfmas-common"
-version = "0.1.29"
+version = "0.1.30"
 description = "Common code for ZALF MAS projects"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [{ name = "Michael Berg-Mohnicke", email = "michael.berg@zalf.de" }]
@@ -13,14 +13,15 @@ dependencies = [
   "pandas>=2.2.2,<3.0.0",
   "psutil>=6.1.0,<7.0.0",
   "tomlkit>=0.13.2,<0.14.0",
-  "zalfmas-capnp-schemas (>=0.1.29,<0.2.0)",
+  "zalfmas-capnp-schemas (>=0.1.36,<0.2.0)",
 ]
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"
 
-# Example for referencing local packages in editable mode
+# Example for referencing local packages in editable mode just uncomment these lines while keeping the above it will overwrite
+# If the line for the package in the dependencies section is commented out it will have no effect
 # [tool.poetry.dependencies]
 # zalfmas-capnp-schemas = { path = "../mas_capnproto_schemas", develop = true }
 

pyproject.toml

@@ -14,22 +14,17 @@
 # Copyright (C: Leibniz Centre for Agricultural Landscape Research (ZALF)
 
 import json
-import os
-import sys
 from datetime import date
 
 import numpy as np
-import zalfmas_capnp_schemas
 from pyproj import CRS
 from scipy.interpolate import NearestNDInterpolator
+from zalfmas_capnp_schemas import climate_capnp
 
 from zalfmas_common import common
 from zalfmas_common import rect_ascii_grid_management as ragm
 from zalfmas_common import service as serv
 
-sys.path.append(os.path.dirname(zalfmas_capnp_schemas.__file__))
-import climate_capnp
-
 
 def read_header(path_to_ascii_grid_file):
     "read metadata from esri ascii grid file"

zalfmas_common/climate/common_climate_data_capnp_impl.py

@@ -16,22 +16,16 @@
 import gzip
 import io
 import itertools
-import os
-import sys
 from collections import OrderedDict, deque
 from datetime import date
 
 import pandas as pd
 import psutil
-import zalfmas_capnp_schemas
+from zalfmas_capnp_schemas import climate_capnp, geo_capnp
 
 from zalfmas_common import common
 from zalfmas_common.climate import common_climate_data_capnp_impl as ccdi
 
-sys.path.append(os.path.dirname(zalfmas_capnp_schemas.__file__))
-import climate_capnp
-import geo_capnp
-
 
 class TimeSeries(
     climate_capnp.TimeSeries.Server, common.Identifiable, common.Persistable

zalfmas_common/climate/csv_file_based.py

@@ -596,11 +596,15 @@ async def restore_context(
 
 
 class Identifiable(common_capnp.Identifiable.Server):
-
-    def __init__(self, id=None, name=None, description=None):
-        self._id = id if id else str(uuid.uuid4())
-        self._name = name if name else f"Unnamed_{self._id}"
-        self._description = description if description else ""
+    def __init__(
+        self,
+        id: str | None = None,
+        name: str | None = None,
+        description: str | None = None,
+    ):
+        self._id: str = id if id else str(uuid.uuid4())
+        self._name: str = name if name else f"Unnamed_{self._id}"
+        self._description: str = description if description else ""
         self._init_info_func = None
 
     @property
@@ -780,9 +784,11 @@ async def connect(self, sturdy_ref, cast_as=None):
                 dyn_obj_reader = (
                     await restorer.restore(localRef={"text": sr_token})
                 ).cap
-                #node = restorer.schema.node
-                #if node.displayName == f"{persistence_capnp.__name__}:Restorer": # and node.id == 11508422749279825468
-                dyn_obj_reader = (await restorer.restore(localRef={"text": sr_token})).cap
+                # node = restorer.schema.node
+                # if node.displayName == f"{persistence_capnp.__name__}:Restorer": # and node.id == 11508422749279825468
+                dyn_obj_reader = (
+                    await restorer.restore(localRef={"text": sr_token})
+                ).cap
                 if dyn_obj_reader is not None:
                     return (
                         dyn_obj_reader.as_interface(cast_as)

zalfmas_common/common.py

@@ -7,29 +7,40 @@
 
 # Authors:
 # Susanne Schulz <susanne.schulz@zalf.de>
-# Michael Berg-Mohnicke <michael.berg@zalf.de>
+# Michael Berg-Mohnicke <michael.berg-mohnicke@zalf.de>
 #
 # Maintainers:
 # Currently maintained by the authors.
 #
-# Copyright (C: Leibniz Centre for Agricultural Landscape Research (ZALF)
+# Copyright (C: Leibniz Centre for Agricultural Landscape Research (ZALF))
 
 import csv
 
-def read_csv(path_to_setups_csv, key="id", key_type=(int,)):
+
+def read_csv(
+    path_to_csv, key="id", key_type=(int,), header_row_line=1, data_row_start=2
+):
     """read sim setup from csv file"""
     composite_key = type(key) is tuple
     keys = {i: v for i, v in enumerate(key)} if composite_key else {0: key}
     key_types = {i: v for i, v in enumerate(key_type)}
 
-    with open(path_to_setups_csv) as _:
+    with open(path_to_csv) as _:
         key_to_data = {}
         # determine seperator char
-        dialect = csv.Sniffer().sniff(_.read(), delimiters=';,\t')
+        dialect = csv.Sniffer().sniff(_.read(), delimiters=";,\t")
         _.seek(0)
         # read csv with seperator char
         reader = csv.reader(_, dialect)
+        line = 1
+        while line < header_row_line:
+            next(reader)
+            line += 1
         header_cols = next(reader)
+        line += 1
+        while line < data_row_start:
+            next(reader)
+            line += 1
 
         for row in reader:
             data = {}
@@ -46,7 +57,9 @@ def read_csv(path_to_setups_csv, key="id", key_type=(int,)):
                     value = key_types[0](value)
                 data[header_col] = value
             if composite_key:
-                key_vals = tuple([key_types.get(i, key_types[0])(data[k]) for i, k in keys.items()])
+                key_vals = tuple(
+                    [key_types.get(i, key_types[0])(data[k]) for i, k in keys.items()]
+                )
             else:
                 key_vals = key_types[0](data[key])
             key_to_data[key_vals] = data

zalfmas_common/csv.py

@@ -10,15 +10,10 @@
 #
 # Copyright (C: Leibniz Centre for Agricultural Landscape Research (ZALF)
 
-import os
-import sys
 from collections import defaultdict
 
-import zalfmas_capnp_schemas
 from pyproj import CRS, Transformer
-
-sys.path.append(os.path.dirname(zalfmas_capnp_schemas.__file__))
-import geo_capnp
+from zalfmas_capnp_schemas import geo_capnp
 
 
 def name_to_struct_instance(name, x=None, y=None, default=None):

zalfmas_common/geo.py

@@ -23,7 +23,14 @@ def read_header(path_to_ascii_grid_file, no_of_header_lines=6):
     """read metadata from esri ascii grid file"""
 
     def read_header_from(f):
-        possible_headers = ["ncols", "nrows", "xllcorner", "yllcorner", "cellsize", "nodata_value"]
+        possible_headers = [
+            "ncols",
+            "nrows",
+            "xllcorner",
+            "yllcorner",
+            "cellsize",
+            "nodata_value",
+        ]
         metadata = {}
         header_str = ""
         for i in range(0, no_of_header_lines):
@@ -133,6 +140,7 @@ def load_grid_and_metadata_from_ascii_grid(
     grid = np.loadtxt(path_to_ascii_grid, dtype=datatype, skiprows=no_of_header_rows)
     return (grid, metadata)
 
+
 def load_grid_cached(path_to_grid, val_type, print_path=False):
     if not hasattr(load_grid_cached, "cache"):
         load_grid_cached.cache = {}
@@ -161,10 +169,12 @@ def value(lat, lon, return_no_data=False):
         return None
 
     cache_entry = {
-        "metadata": md, "grid": grid, "ll0r": ll0r,
+        "metadata": md,
+        "grid": grid,
+        "ll0r": ll0r,
         "col": lambda lon: col(lon),
         "row": lambda lat: row(lat),
-        "value": lambda lat, lon, ret_no_data: value(lat, lon, ret_no_data)
+        "value": lambda lat, lon, ret_no_data: value(lat, lon, ret_no_data),
     }
     load_grid_cached.cache[path_to_grid] = cache_entry
     return cache_entry
@@ -196,10 +206,13 @@ def create_climate_geoGrid_interpolator_from_json_file(
 
         return NearestNDInterpolator(np.array(points), np.array(values))
 
+
 def get_lat_0_lon_0_resolution_from_grid_metadata(metadata):
-    lat_0 = float(metadata["yllcorner"]) \
-            + (float(metadata["cellsize"]) * float(metadata["nrows"])) \
-            - (float(metadata["cellsize"]) / 2.0)
+    lat_0 = (
+        float(metadata["yllcorner"])
+        + (float(metadata["cellsize"]) * float(metadata["nrows"]))
+        - (float(metadata["cellsize"]) / 2.0)
+    )
     lon_0 = float(metadata["xllcorner"]) + (float(metadata["cellsize"]) / 2.0)
     resolution = float(metadata["cellsize"])
-    return {"lat_0": lat_0, "lon_0": lon_0, "res": resolution}
+    return {"lat_0": lat_0, "lon_0": lon_0, "res": resolution}