Merge pull request #38 from DHI/dev_fixed

wuwwen · web-flow · commit 69d0bdd6e356 · 2024-06-13T16:49:02.000+08:00
Changes from Dev with a proper merge of main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,19 @@
 
 ## [Unreleased]
 
-## [2024.0.0] - 2024-01-30
+## [2024.1.0] - 2024-01-30
 
 ### Added
 
 - Ability to read/write MIKE+ database
 - Ability to run engines (MIKE 1D, EPANET, SWMM)
 - Ability to run some initial tools
+
+## [2024.1.0] - 2024-06-02
+
+### Added
+
+- Fix Opening and closing a database in a loop takes increasingly long time 
+- Fix setting the value of a database does not auto cast values. Int value can accept as double value now.
+- Fix inserting fails silently when no value is provided for 'Seq'
+- Handle Nullable value more user friendly
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ MIKE+Py is a python interface for MIKE+. Its main features include:
 > * If you encounter any issues or have any feedback, please report them on [GitHub Issues](https://github.com/DHI/mikepluspy/issues).
 
 ## Requirements
-* MIKE+ 2024 (or greater) with valid license
+* MIKE+ 2024 update 1 (or greater) with valid license
 * Python x64 3.8 to 3.12
 * Windows operating system
 
@@ -26,7 +26,7 @@ The version of MIKE+Py you install must match the version of MIKE+ installed on
 
 | MIKE+ Version | Install command|
 |:--------------|:---------------|
-| MIKE+ 2024    | `pip install https://github.com/DHI/mikepluspy/archive/refs/tags/v2024.0-latest.zip` |
+| MIKE+ 2024 update 1 | `pip install https://github.com/DHI/mikepluspy/archive/refs/tags/v2024.1-latest.zip` |
 
 
 ## Examples
diff --git a/mikeplus/__init__.py b/mikeplus/__init__.py
@@ -1,6 +1,6 @@
 import clr
 
-__version__ = "2024.0.0"
+__version__ = "2024.1.0"
 
 clr.AddReference("DHI.Mike.Install, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c513450b5d0bf0bf")
 from DHI.Mike.Install import MikeImport, MikeProducts
diff --git a/mikeplus/datatableaccess.py b/mikeplus/datatableaccess.py
@@ -1,4 +1,5 @@
 import os.path
+import System
 from System import Object
 from System import String
 from System.Collections.Generic import Dictionary
@@ -196,7 +197,10 @@ def insert(self, table_name, muid, values=None):
         value_dict = Dictionary[String, Object]()
         if values is not None:
             for col in values:
-                value_dict[col] = values[col]
+                if isinstance(values[col], int):
+                    value_dict[col] = System.Nullable[int](values[col])
+                else:
+                    value_dict[col] = values[col]
         result, new_muid = self._datatables[table_name].InsertByCommand(muid, None, value_dict, False, False)
 
     def delete(self, table_name, muid):
diff --git a/mikeplus/engines/__init__.py b/mikeplus/engines/__init__.py
@@ -8,8 +8,7 @@
 clr.AddReference("DHI.Amelia.DataModule.Interface")
 clr.AddReference("DHI.Amelia.Infrastructure.Interface")
 clr.AddReference("DHI.Amelia.GlobalUtility")
-clr.AddReference("DHI.Amelia.DomainServices")
-clr.AddReference("DHI.Amelia.DomainServices.Interface")
+clr.AddReference("DHI.Amelia.Tools.EngineTool")
 
 from .engine1d import Engine1D
 from .epanet import EPANET
diff --git a/mikeplus/engines/epanet.py b/mikeplus/engines/epanet.py
@@ -1,6 +1,5 @@
 import os.path
-from DHI.Amelia.DomainServices.Services import AmeliaEngineService
-from DHI.Amelia.DomainServices.Services import AmeliaDataService
+from DHI.Amelia.Tools.EngineTool import EngineTool
 from DHI.Amelia.GlobalUtility.DataType import MUSimulationOption
 from DHI.Amelia.DataModule.Interface.Services import IMwProjectTable
 from System.Threading import CancellationTokenSource
@@ -41,14 +40,11 @@ def run_engine_epanet(self,
         
         if verbose:
             print("Simulation id is " + simMuid)
-        data_service = AmeliaDataService()
-        data_service.DataTables = self._dataTables
-        engine_service = AmeliaEngineService()
-        engine_service.DataTables = self._dataTables
-        engine_service.DataService = data_service
+        engine_tool = EngineTool()
+        engine_tool.DataTables = self._dataTables
         cancel_source = CancellationTokenSource()
         msg = List[str]()
-        success = engine_service.RunEngine_AllEpanet(MUSimulationOption.WD_EPANET, cancel_source.Token, msg, None, None, None, simMuid, None, None)
+        success = engine_tool.RunEngine_AllEpanet(MUSimulationOption.WD_EPANET, cancel_source.Token, msg, None, None, None, simMuid, None, None)
         if self._result_file is None:
             self._result_file = self._get_result_file(simMuid)
         dir = os.path.dirname(os.path.abspath(self._result_file))
diff --git a/mikeplus/engines/swmm.py b/mikeplus/engines/swmm.py
@@ -1,6 +1,5 @@
 import os.path
-from DHI.Amelia.DomainServices.Services import AmeliaEngineService
-from DHI.Amelia.DomainServices.Services import AmeliaDataService
+from DHI.Amelia.Tools.EngineTool import EngineTool
 from DHI.Amelia.DataModule.Interface.Services import IMProjectTable
 from System.Threading import CancellationTokenSource
 from System.Collections.Generic import List
@@ -40,14 +39,11 @@ def run(self,
         
         if verbose:            
             print("Simulation id is " + simMuid)
-        data_service = AmeliaDataService()
-        data_service.DataTables = self._dataTables
-        engine_service = AmeliaEngineService()
-        engine_service.DataTables = self._dataTables
-        engine_service.DataService = data_service
+        engine_tool = EngineTool()
+        engine_tool.DataTables = self._dataTables
         cancel_source = CancellationTokenSource()
         msg = List[str]()
-        success = engine_service.RunEngine_AllSWMM(cancel_source.Token, msg, None, None, None, simMuid, None, None)
+        success = engine_tool.RunEngine_AllSWMM(cancel_source.Token, msg, None, None, None, simMuid, None, None)
         if self._result_file is None:
             self._result_file = self._get_result_file(simMuid)
         dir = os.path.dirname(os.path.abspath(self._result_file))
diff --git a/notebooks/ToolsAccessor.ipynb b/notebooks/ToolsAccessor.ipynb
@@ -181,7 +181,7 @@
     "\n",
     "catch_ids = [\"imp3\"]\n",
     "tool = CathSlopeLengthProcess(data_access.datatables)\n",
-    "tool.run(catch_ids, \"../tests/testdata/catchSlopeLen/Catch_Slope.shp\", \"tests/testdata/catchSlopeLen/dem.dfs2\", 0)"
+    "tool.run(catch_ids, \"../tests/testdata/catchSlopeLen/Catch_Slope.shp\", \"../tests/testdata/catchSlopeLen/dem.dfs2\", 0)"
    ]
   },
   {
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ exclude = ["notebooks", "tests"]
 
 [project]
 name = "mikeplus"
-version = "2024.0.0"
+version = "2024.1.0"
 dependencies = [
     "numpy",
     'pythonnet<=2.5.2; python_version < "3.7.0"',
diff --git a/tests/test_engine.py b/tests/test_engine.py
@@ -6,7 +6,7 @@
 
 
 def test_mike1d_engine():
-    res_1d_file = os.path.join("tests", "testdata", "Db", "Sirius", "Sirius_RR_and_HDBaseDefault_Network_HD.res1d")
+    res_1d_file = os.path.join("tests", "testdata", "Db", "Sirius", "Sirius_1_DEMOBaseDefault_Network_HD.res1d")
     if os.path.exists(res_1d_file):
         os.remove(res_1d_file)
     dbFile = os.path.join("tests", "testdata", "Db", "Sirius", "Sirius.sqlite")

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@`
`181`	`181`	`"\n",`
`182`	`182`	`"catch_ids = [\"imp3\"]\n",`
`183`	`183`	`"tool = CathSlopeLengthProcess(data_access.datatables)\n",`
`184`		`- "tool.run(catch_ids, \"../tests/testdata/catchSlopeLen/Catch_Slope.shp\", \"tests/testdata/catchSlopeLen/dem.dfs2\", 0)"`
	`184`	`+ "tool.run(catch_ids, \"../tests/testdata/catchSlopeLen/Catch_Slope.shp\", \"../tests/testdata/catchSlopeLen/dem.dfs2\", 0)"`
`185`	`185`	`]`
`186`	`186`	`},`
`187`	`187`	`{`