Merge pull request #100 from peak-solution/dev

build: Release 1.0.4

Author: totonga

.devcontainer/Dockerfile

@@ -7,6 +7,7 @@ ENV FLIT_ROOT_INSTALL=1
 
 COPY pyproject.toml .
 RUN touch README.md \
+    touch LICENSE \
     && mkdir -p src/odsbox \
     && python -m flit install --only-deps --deps develop \
-    && rm -r pyproject.toml README.md src
+    && rm -r pyproject.toml README.md LICENSE src

.github/workflows/sphinx.yml

@@ -15,4 +15,4 @@ jobs:
       id-token: write
     steps:
     - id: deployment
-      uses: sphinx-notes/pages@3.1
+      uses: sphinx-notes/pages@3.2

pyproject.toml

@@ -31,29 +31,29 @@ classifiers = [
 requires-python = ">=3.10.12"
 dynamic = ["version"]
 dependencies = [
-    "protobuf>=5.27.0,<6.0.0",
+    "protobuf>=5.27.0,<7.0.0",
     "requests>=2.30.0,<3.0.0",
     "pandas>=2.2.0,<3.0.0",
 ]
 
 [project.optional-dependencies]
 exd-data = ["grpcio>=1.59.3,<2.0.0"]
 test = [
-    "bandit[toml]==1.7.10",
-    "black==24.10.0",
+    "bandit[toml]==1.8.3",
+    "black==25.1.0",
     "check-manifest==0.50",
-    "flake8-bugbear==24.8.19",
+    "flake8-bugbear==24.12.12",
     "flake8-docstrings",
     "flake8-formatter_junit_xml",
     "flake8",
     "flake8-pyproject",
-    "pre-commit==4.0.1",
-    "pylint==3.3.1",
+    "pre-commit==4.2.0",
+    "pylint==3.3.4",
     "pylint_junit",
     "pytest-cov==6.0.0",
     "pytest-mock<3.14.1",
     "pytest-runner",
-    "pytest==8.3.3",
+    "pytest==8.3.5",
     "pytest-github-actions-annotate-failures",
     "pytest-xdist",
     "shellcheck-py==0.10.0.1",

src/odsbox/__init__.py

@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"

src/odsbox/con_i.py

@@ -136,7 +136,7 @@ def __call__(self, r):
         self.model_read()
 
     def __del__(self):
-        if None is not self.__session:
+        if self.__session is not None:
             self.logout()
 
     def __enter__(self):

src/odsbox/jaquel.py

@@ -250,7 +250,12 @@ def __parse_path_and_add_joins(
             attribute_name = relation.name
 
             # add join
-            if (-1 == relation.range_max) and (1 == relation.inverse_range_max):
+            if (
+                (-1 == relation.range_max)
+                and (1 == relation.inverse_range_max)
+                and join_type != ods.SelectStatement.JoinItem.JoinTypeEnum.JT_OUTER
+            ):
+                # in case of OUTER join the direction is important and must be like addressed
                 inverse_entity = model.entities[relation.entity_name]
                 inverse_relation = inverse_entity.relations[relation.inverse_name]
                 __add_join_to_seq(model, inverse_entity, inverse_relation, joins, join_type)

src/odsbox/submatrix_to_pandas.py

@@ -80,7 +80,7 @@ def __convert_bulk_to_pandas_data_frame(
             ]
 
     rv = pd.DataFrame(column_dict)
-    if None is not independent_local_column_name:
+    if independent_local_column_name is not None:
         rv.set_index(independent_local_column_name)
 
     return rv

tests/test_con_i.py

@@ -10,7 +10,7 @@
 
 def __create_con_i():
     """Create a connection session for an ASAM ODS server"""
-    return ConI("http://79.140.180.128:10032/api", ("sa", "sa"))
+    return ConI("https://docker.peak-solution.de:10032/api", ("Demo", "mdm"))
 
 
 def test_con_i():
@@ -82,3 +82,24 @@ def test_submatrix_load():
             logging.getLogger().info(submatrix_id)
             submatrix_dataframe = submatrix_to_pandas(con_i, submatrix_id)
             assert submatrix_dataframe is not None
+
+
+def test_bug_93_outer_join_on_n_relation():
+    logging.getLogger().info(
+        "In case of outer join the direction is important and must point from n to 1 when generated from jaquel."
+    )
+    with __create_con_i() as con_i:
+        df = con_i.query_data(
+            {
+                "AoMeasurement": {},
+                "$attributes": {
+                    "name": 1,
+                    "measurement_quantities:OUTER": {"name": 1, "unit:OUTER.name": 1},
+                    "submatrices:OUTER.name": 1,
+                },
+                "$options": {"$rowlimit": 10},
+            }
+        )
+        assert df is not None
+        assert df.empty is False
+        assert 4 == len(df.columns)

tests/test_con_i_file_access.py

@@ -12,7 +12,7 @@
 
 @pytest.fixture
 def con_i():
-    return ConI("http://79.140.180.128:10032/api", ("sa", "sa"))
+    return ConI("https://docker.peak-solution.de:10032/api", ("Demo", "mdm"))
 
 
 def test_file_access_download_success(con_i):

tests/test_data/jaquel/bugs/bug_93_outer_join_must_preserve_direction.json

@@ -0,0 +1,14 @@
+{
+    "AoMeasurement": {},
+    "$attributes": {
+        "name": 1,
+        "measurement_quantities:OUTER": {
+            "name": 1,
+            "unit:OUTER.name": 1
+        },
+        "submatrices:OUTER.name": 1
+    },
+    "$options": {
+        "$rowlimit": 10
+    }
+}