OpenSimula 0.7.1__tar.gz → 0.8.5__tar.gz

{opensimula-0.7.1 → opensimula-0.8.5}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Juan F. Coronel
+Copyright (c) 2026 Juan F. Coronel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{opensimula-0.7.1 → opensimula-0.8.5}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.4
 Name: opensimula
-Version: 0.7.1
+Version: 0.8.5
 Summary: Component-based time simulation environment in Python
 Author-email: "Juan F. Coronel" <jfc@us.es>
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dash>=3.2.0
-Requires-Dist: dash-ag-grid>=32.3.2
-Requires-Dist: dash-bootstrap-components>=2.0.4
+Requires-Dist: anywidget>=0.11.0
+Requires-Dist: jsonschema>=4.26.0
 Requires-Dist: nbformat>=5.10.4
 Requires-Dist: numpy>=2.3.3
 Requires-Dist: openpyxl>=3.1.5
@@ -43,5 +42,4 @@ Component-based time simulation environment in Python
 - nbformat
 - openpyxl
 - tqdm
-- triangle
 - vedo

{opensimula-0.7.1 → opensimula-0.8.5}/README.md

@@ -20,5 +20,4 @@ Component-based time simulation environment in Python
 - nbformat
 - openpyxl
 - tqdm
-- triangle
 - vedo

{opensimula-0.7.1 → opensimula-0.8.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opensimula"
-version = "0.7.1"
+version = "0.8.5"
 requires-python = ">=3.12"
 authors = [
   { name="Juan F. Coronel", email="jfc@us.es" },
@@ -8,9 +8,8 @@ authors = [
 description = "Component-based time simulation environment in Python"
 readme = "README.md"
 dependencies = [
-    "dash>=3.2.0",
-    "dash-ag-grid>=32.3.2",
-    "dash-bootstrap-components>=2.0.4",
+    "anywidget>=0.11.0",
+    "jsonschema>=4.26.0",
     "nbformat>=5.10.4",
     "numpy>=2.3.3",
     "openpyxl>=3.1.5",
@@ -20,7 +19,7 @@ dependencies = [
     "scipy>=1.16.2",
     "shapely>=2.1.1",
     "tqdm>=4.67.1",
-"vedo>=2025.5.4",
+    "vedo>=2025.5.4",
 ]
 
 [dependency-groups]
@@ -31,6 +30,10 @@ dev = [
     "marimo>=0.19.0",
 ]
 
+[tool.setuptools.package-data]
+# The widget loads these at runtime; without this they are left out of the wheel.
+"opensimula.editor" = ["static/*.js", "static/*.css"]
+
 [build-system]
 requires = ["setuptools>=61.2", "wheel"]
 

{opensimula-0.7.1/src/opensimula → opensimula-0.8.5/src/OpenSimula}/Component.py

@@ -38,7 +38,7 @@ class Component(Parameter_container):
 
         Args:
             units (bool, optional): Includes unit in the name of the variable. Defaults to True.
-            frequency (None or str, optional): frequency of the values: None, "H" Hour, "D" Day, "M" Month, "Y" Year . Defaults to None.
+            frequency (None or str, optional): frequency of the values: None, "hourly", "daily", "monthly", "yearly". Defaults to None.
             value (str, optional): "mean", "sum", "sum_pos", "sum_neg", "max" or "min". Defaults to "mean".
             interval (None or list of two dates): List with the start and end dates of the period to be included in the dataframe, if the value is None all values are included.
             pos_neg_columns (list of str, optional): List of variables that will be included in separate columns positive and negative values. Defaults to [].
@@ -62,14 +62,19 @@ class Component(Parameter_container):
                 data[col + "_pos"] = data[col].apply(lambda x: x if x > 0 else 0)
                 data[col + "_neg"] = data[col].apply(lambda x: x if x < 0 else 0)
         if frequency is not None:
+            freq={"hourly": "h", "daily": "D", "monthly": "ME", "yearly": "YE"}
             if value == "mean":
-                data = data.resample(frequency, on='date').mean()
+                data = data.resample(freq[frequency], on='date').mean()
             elif value == "sum":
-                data = data.resample(frequency, on='date').sum()
+                data = data.resample(freq[frequency], on='date').sum()
+            elif value == "sum_pos":
+                data = data.resample(freq[frequency], on='date').apply(lambda x: x.clip(lower=0).sum())
+            elif value == "sum_neg":
+                data = data.resample(freq[frequency], on='date').apply(lambda x: x.clip(upper=0).sum())
             elif value == "max":
-                data = data.resample(frequency, on='date').max()
+                data = data.resample(freq[frequency], on='date').max()
             elif value == "min":
-                data = data.resample(frequency, on='date').min()
+                data = data.resample(freq[frequency], on='date').min()
         if interval is not None:
             data = data[(data['date'] > interval[0]) &
                         (data['date'] < interval[1])]
@@ -77,36 +82,43 @@ class Component(Parameter_container):
 
     # ____________ Functions that must be overwriten for time simulation _________________
 
-    def get_all_referenced_components(self):
+    def get_all_referenced_components(self, _seen=None):
         """Get list of all referenced components, first itself. Look recursively at the referenced components
 
+        Args:
+            _seen (set, optional): components already walked, used internally.
+                References can form a cycle, if only because a wrong name gets
+                typed into a reference, and without remembering where it has
+                been the walk follows it until the stack runs out.
+
         Returns:
             component_list (component[])
         """
+        if _seen is None:
+            _seen = set()
+        if id(self) in _seen:
+            return []
+        _seen.add(id(self))
+
         comp_list = []
+
+        def walk(component):
+            if component is not None:
+                comp_list.extend(component.get_all_referenced_components(_seen))
+
         for key, value in self.parameter_dict().items():
             if value.type == "Parameter_component":
-                if value.component is not None:
-                    sublist = value.component.get_all_referenced_components()
-                    for subcomp in sublist:
-                        comp_list.append(subcomp)
+                walk(value.component)
             elif value.type == "Parameter_component_list":
                 for comp in value.component:
-                    if comp is not None:
-                        sublist = comp.get_all_referenced_components()
-                        for subcomp in sublist:
-                            comp_list.append(subcomp)
+                    walk(comp)
             if value.type == "Parameter_variable":
                 if value.variable is not None:
-                    sublist = value.variable.parent.get_all_referenced_components()
-                    for subcomp in sublist:
-                        comp_list.append(subcomp)
+                    walk(value.variable.parent)
             elif value.type == "Parameter_variable_list":
                 for var in value.variable:
                     if var is not None:
-                        sublist = var.parent.get_all_referenced_components()
-                        for subcomp in sublist:
-                            comp_list.append(subcomp)
+                        walk(var.parent)
         comp_list.append(self)
         return comp_list
 

{opensimula-0.7.1/src/opensimula → opensimula-0.8.5/src/OpenSimula}/Parameters.py

@@ -184,7 +184,9 @@ class Parameter_string_list(Parameter):
         else:
             for el in value:
                 el = str(el)
-            self._value_ = value
+            # Own copy: keeping the caller list would let it be mutated from
+            # outside, and would be shared by every parameter assigned from it
+            self._value_ = list(value)
 
 
 # _____________ Parameter_int ___________________________
@@ -201,6 +203,14 @@ class Parameter_int(Parameter):
     def unit(self):
         return self._unit_
 
+    @property
+    def min(self):
+        return self._min_
+
+    @property
+    def max(self):
+        return self._max_
+
     @property
     def value(self):
         return self._value_
@@ -235,6 +245,14 @@ class Parameter_int_list(Parameter):
     def unit(self):
         return self._unit_
 
+    @property
+    def min(self):
+        return self._min_
+
+    @property
+    def max(self):
+        return self._max_
+
     @property
     def value(self):
         return self._value_
@@ -389,7 +407,9 @@ class Parameter_options_list(Parameter):
         else:
             for el in value:
                 el = str(el)
-            self._value_ = value
+            # Own copy: keeping the caller list would let it be mutated from
+            # outside, and would be shared by every parameter assigned from it
+            self._value_ = list(value)
 
     @property
     def options(self):
@@ -484,7 +504,9 @@ class Parameter_component_list(Parameter):
         # Is a list
         for el in value:
             el = str(el)
-        self._value_ = value
+        # Own copy: keeping the caller list would let it be mutated from
+        # outside, and would be shared by every parameter assigned from it
+        self._value_ = list(value)
 
         self._external_ = []
         for el in self.value:
@@ -622,7 +644,9 @@ class Parameter_variable_list(Parameter):
         # Is a list
         for el in value:
             el = str(el)
-        self._value_ = value
+        # Own copy: keeping the caller list would let it be mutated from
+        # outside, and would be shared by every parameter assigned from it
+        self._value_ = list(value)
 
         format_error = False
         self._symbol_ = []
@@ -744,7 +768,9 @@ class Parameter_math_exp_list(Parameter):
         # Is a list
         for el in value:
             el = str(el)
-        self._value_ = value
+        # Own copy: keeping the caller list would let it be mutated from
+        # outside, and would be shared by every parameter assigned from it
+        self._value_ = list(value)
 
     def evaluate(self, i, values_dic):
         try:

{opensimula-0.7.1/src/opensimula → opensimula-0.8.5/src/OpenSimula}/Project.py

@@ -2,9 +2,6 @@ import json
 import datetime as dt
 import numpy as np
 import pandas as pd
-from dash import Dash, callback, Input, Output, html, State
-import dash_ag_grid as dag
-import dash_bootstrap_components as dbc
 import psychrolib as sicro
 from tqdm import trange
 from opensimula.Message import Message
@@ -59,13 +56,14 @@ class Project(Parameter_container):
         )
         self.add_parameter(
             Parameter_options(
-                "shadow_calculation", "INSTANT", ["NO", "INSTANT", "INTERPOLATION"]
+                "shadow_calculation", "INTERPOLATION", ["NO", "INSTANT", "INTERPOLATION"]
             )
         )
         self.add_parameter(Parameter_float("albedo", 0.2, "frac", min=0, max=1))
 
         self._sim_ = sim
         self._components_ = []
+        self._components_dict_ = {}  # name -> component index, see component()
         sicro.SetUnitSystem(sicro.SI)
         atm_p = sicro.GetStandardAtmPressure(0)
         w_50 = sicro.GetHumRatioFromRelHum(22.5, 0.5, atm_p)
@@ -93,6 +91,18 @@ class Project(Parameter_container):
             "RHOCP_W": rhocp_water,
         }
 
+    def clear(self):
+        """Remove every component from the Project
+
+        The parameters of the project itself keep their values; only its
+        components are dropped. Needed before reloading a definition into a
+        project that already holds one, because read_dict() and read_json()
+        add components, they do not replace them.
+        """
+        self._components_ = []
+        self._components_dict_ = {}
+        self._ordered_component_list_ = []
+
     def del_component(self, component):
         """Delete component from Project
 
@@ -100,6 +110,13 @@ class Project(Parameter_container):
             component (Component): Component to be removed from the project
         """
         self._components_.remove(component)
+        # Drop every index entry pointing at it, so a later component reusing
+        # its name cannot resolve to the deleted one.
+        self._components_dict_ = {
+            key: comp
+            for key, comp in self._components_dict_.items()
+            if comp is not component
+        }
 
     def component(self, name):
         """Find and return component with its name
@@ -110,8 +127,16 @@ class Project(Parameter_container):
         Returns:
             component (Component): component found, None if not found.
         """
+        # Components are looked up by name millions of times during a
+        # simulation, so hits are served from an index. The cached component is
+        # revalidated against its current name because components can be
+        # renamed after being indexed; a stale entry falls back to the scan.
+        comp = self._components_dict_.get(name)
+        if comp is not None and comp.parameter("name").value == name:
+            return comp
         for comp in self._components_:
             if comp.parameter("name").value == name:
+                self._components_dict_[name] = comp
                 return comp
         return None
 
@@ -586,100 +611,76 @@ class Project(Parameter_container):
     def simulation_dataframe(self):
         return self._sim_df
 
-    def component_editor(self, comp_type="all"):
-        editor = Dash(external_stylesheets=[dbc.themes.BOOTSTRAP])
-        df = self.component_dataframe(comp_type=comp_type, string_format=True)
-        self._n_clicks_new_comp_ = 0
-        self._n_clicks_del_comp_ = 0
-        disabled_new = False
-        if comp_type == "all":
-            disabled_new = True
-
-        column_definition = [
-            {
-                "field": "name",
-                "checkboxSelection": True,
-                "headerCheckboxSelection": True,
-            }
-        ]
-        for i in df.columns:
-            if i != "name":
-                column_definition.append({"field": i})
-
-        editor.layout = html.Div(
-            [
-                dbc.Label("Components editor:"),
-                html.Br(),
-                dbc.Button(
-                    "New component",
-                    id="btn-new-comp",
-                    disabled=disabled_new,
-                    n_clicks=0,
-                ),
-                dbc.Button(
-                    "Delete selected components",
-                    id="btn-del-comp",
-                    n_clicks=0,
-                    style={"margin-left": "15px"},
-                ),
-                html.Br(),
-                html.Br(),
-                dag.AgGrid(
-                    id="comp-table",
-                    rowData=df.to_dict("records"),
-                    columnDefs=column_definition,
-                    columnSize="sizeToFit",
-                    defaultColDef={"filter": True, "editable": True},
-                    style={"height": "500px"},
-                    dashGridOptions={
-                        "rowSelection": "multiple",
-                        "suppressRowClickSelection": True,
-                        "pagination": True,
-                    },
-                ),
-            ]
-        )
+    def editor(self):
+        """Interactive editor for the whole project definition.
 
-        @callback(
-            Output("comp-table", "rowData"),
-            Input("comp-table", "cellValueChanged"),
-            Input("btn-new-comp", "n_clicks"),
-            Input("btn-del-comp", "n_clicks"),
-            State("comp-table", "selectedRows"),
-            prevent_initial_call=True,
-        )
-        def update_data(changed, n_clicks_new, n_clicks_del, selectedRows):
-            if self._n_clicks_new_comp_ < n_clicks_new:
-                self.new_component(comp_type, "new_comp_" + str(n_clicks_new))
-                self._n_clicks_new_comp_ = n_clicks_new
-            elif self._n_clicks_del_comp_ < n_clicks_del:
-                for row in selectedRows:
-                    self.del_component(self.component(row["name"]))
-                self._n_clicks_del_comp_ = n_clicks_del
-            else:
-                if changed is not None:
-                    if changed[0]["colId"] == "name":
-                        self.component(changed[0]["oldValue"]).parameter(
-                            "name"
-                        ).value = changed[0]["value"]
-                    else:
-                        self.component(changed[0]["data"]["name"]).parameter(
-                            changed[0]["colId"]
-                        ).value = changed[0]["value"]
-            df_end = self.component_dataframe(comp_type=comp_type, string_format=True)
-            return df_end.to_dict("records")
+        Returns an anywidget that works in Jupyter and, wrapped in
+        mo.ui.anywidget(), in Marimo. The document is read with write_dict();
+        the widget does not write back to this project.
 
-        editor.run(jupyter_height=600)
+        Returns:
+            ProjectEditor: widget holding the project document in .value
+        """
+        # Imported here: opensimula.editor reaches Project through Simulation,
+        # so a module level import would close the cycle.
+        from opensimula.editor import ProjectEditor
+
+        return ProjectEditor(self)
 
     def create_3D_environment(self, env_3D):
         for component in self.component_list("all"):
-            if hasattr(component, "get_polygon_3D"):
-                env_3D.add_polygon_3D(component.get_polygon_3D())
+            if not hasattr(component, "get_polygon_3D"):
+                continue
+            try:
+                polygon = component.get_polygon_3D()
+            except (AttributeError, IndexError, TypeError):
+                # A surface whose space, or an opening whose surface, does not
+                # resolve has no place to be. It is left out rather than
+                # bringing the whole view down; check() names the reference.
+                continue
+            self._set_polygon_origin_(polygon, component)
+            env_3D.add_polygon_3D(polygon)
+
+    def _set_polygon_origin_(self, polygon, component):
+        """Record which component a polygon came from, and which spaces it bounds.
+
+        Polygon_3D is geometry and knows nothing of the model, so the link is
+        made here, where the component is still at hand. It is what lets a
+        viewer show one space at a time; an interior partition belongs to the
+        two spaces on either side of it.
+        """
+        polygon.component = component.parameter("name").value
+        polygon.component_type = component.parameter("type").value
+
+        surface = component
+        if polygon.component_type == "Opening":
+            surface = component.get_surface()
+        if surface is None:
+            return
+
+        parameters = surface.parameter_dict()
+        if "surface_type" in parameters:
+            polygon.surface_type = parameters["surface_type"].value
+        if "spaces" in parameters:
+            polygon.spaces = [
+                name for name in parameters["spaces"].value if name != "not_defined"
+            ]
            
+    def geometry_dict(self):
+        """Geometry of the project as plain data, for a 3D viewer
+
+        Returns:
+            dict: {"meshes": [...], "spaces": [...]}, one mesh per polygon with
+                its triangles and the component and spaces it belongs to
+        """
+        env_3D = Environment_3D()
+        self.create_3D_environment(env_3D)
+        return env_3D.geometry_dict()
+
     def show_3D(self, jupyter=False):
         env_3D = Environment_3D()
         self.create_3D_environment(env_3D)
-        env_3D.show(polygons_type="initial", jupyter=jupyter)
+        return env_3D.show(polygons_type="initial", jupyter=jupyter)
 
     def show_3D_shadows(self, date, jupyter=False):
         env_3D = Environment_3D()

{opensimula-0.7.1/src/opensimula → opensimula-0.8.5/src/OpenSimula}/Simulation.py

@@ -2,9 +2,6 @@ from opensimula.Project import Project
 import pandas as pd
 import plotly.express as px
 from plotly.subplots import make_subplots
-from dash import Dash, callback, Input, Output, html, State
-import dash_ag_grid as dag
-import dash_bootstrap_components as dbc
 
 
 class Simulation:
@@ -96,18 +93,17 @@ class Simulation:
         """Return the list of messages"""
         return self._messages_
 
-    def plot(self, dates, variables, names=[], axis=[], frequency=None, value="mean"):
+    def plot(self, dates, variables, names=[], axis=[], frequency=None, value="mean",interval=None):
         """_summary_
         Draw variables graph (using plotly)
 
         Args:
             variables: List of hourly variables
             axis: list of axis y 1 or 2 to use for each variable, empty all in first axis
-            frequency (None or str, optional): frequency of the values: None, "H" Hour, "D" Day, "M" Month, "Y" Year . Defaults to None.
-            value (str, optional): "mean", "sum", "max" or "min". Defaults to "mean".
-
+            frequency (None or str, optional): frequency of the values: None, "hourly", "daily", "monthly", "yearly". Defaults to None.
+            value (str, optional): "mean", "sum", "sum_pos", "sum_neg", "max" or "min". Defaults to "mean".
+            interval (None or list of two dates): List with the start and end dates of the period to be included in the dataframe, if the value is None all values are included.
         """
-
         series = {}
         series["date"] = dates
         for i in range(len(variables)):
@@ -121,15 +117,24 @@ class Simulation:
                     series[variables[i].key] = variables[i].values
         data = pd.DataFrame(series)
         if frequency is not None:
+            freq={"hourly": "h", "daily": "D", "monthly": "ME", "yearly": "YE"}
             if value == "mean":
-                data = data.resample(frequency, on='date').mean()
+                data = data.resample(freq[frequency], on='date').mean()
             elif value == "sum":
-                data = data.resample(frequency, on='date').sum()
+                data = data.resample(freq[frequency], on='date').sum()
+            elif value == "sum_pos":
+                data = data.resample(freq[frequency], on='date').apply(lambda x: x.clip(lower=0).sum())
+            elif value == "sum_neg":
+                data = data.resample(freq[frequency], on='date').apply(lambda x: x.clip(upper=0).sum())
             elif value == "max":
-                data = data.resample(frequency, on='date').max()
+                data = data.resample(freq[frequency], on='date').max()
             elif value == "min":
-                data = data.resample(frequency, on='date').min()
+                data = data.resample(freq[frequency], on='date').min()
             data["date"] = data.index
+        if interval is not None:
+            data = data[(data['date'] > interval[0]) &
+                        (data['date'] < interval[1])]
+
 
         subfig = make_subplots(specs=[[{"secondary_y": True}]])
 
@@ -155,63 +160,3 @@ class Simulation:
         # fig.update_traces(showlegend=True)
         subfig.show()
 
-    def project_editor(self):
-        editor = Dash(external_stylesheets=[dbc.themes.BOOTSTRAP])
-        df = self.project_dataframe(string_format=True)
-        self._n_clicks_new_project_ = 0
-        self._n_clicks_del_project_ = 0
-        column_definition = [
-            {"field": "name", "checkboxSelection": True, "headerCheckboxSelection": True}]
-        for i in df.columns:
-            if i != "name":
-                column_definition.append({"field": i})
-
-        editor.layout = html.Div([
-            dbc.Label("Projects editor:  "),
-            html.Br(),
-            dbc.Button('New project', id='btn-new-project', n_clicks=0),
-            dbc.Button('Delete selected projects',
-                       id='btn-del-project', n_clicks=0, style={"margin-left": "15px"}),
-            html.Br(),
-            html.Br(),
-            dag.AgGrid(
-                id="project-table",
-                rowData=df.to_dict("records"),
-                columnDefs=column_definition,
-                columnSize="sizeToFit",
-                defaultColDef={"filter": True, "editable": True},
-                style={"height": '250px'},
-                dashGridOptions={
-                    "rowSelection": "multiple",
-                    "suppressRowClickSelection": True,
-                    "pagination": True,
-                })
-        ])
-
-        @callback(
-            Output('project-table', 'rowData'),
-            Input('project-table', 'cellValueChanged'),
-            Input('btn-new-project', 'n_clicks'),
-            Input('btn-del-project', 'n_clicks'),
-            State('project-table', 'selectedRows'),
-            prevent_initial_call=True)
-        def update_data(changed, n_clicks_new, n_clicks_del, selectedRows):
-            if (self._n_clicks_new_project_ < n_clicks_new):
-                self.new_project("new_project_"+str(n_clicks_new))
-                self._n_clicks_new_project_ = n_clicks_new
-            elif (self._n_clicks_del_project_ < n_clicks_del):
-                for row in selectedRows:
-                    self.del_project(self.project(row["name"]))
-                self._n_clicks_del_project_ = n_clicks_del
-            else:
-                if changed is not None:
-                    if changed[0]["colId"] == "name":
-                        self.project(changed[0]['oldValue']).parameter(
-                            "name").value = changed[0]["value"]
-                    else:
-                        self.project(changed[0]['data']["name"]).parameter(
-                            changed[0]["colId"]).value = changed[0]["value"]
-            df_end = self.project_dataframe(string_format=True)
-            return df_end.to_dict("records")
-
-        editor.run(jupyter_height=350)

{opensimula-0.7.1/src/opensimula → opensimula-0.8.5/src/OpenSimula}/__init__.py

@@ -5,4 +5,5 @@ opensimula is a Python Package for perform time simulations
 """
 from opensimula.Simulation import Simulation
 from opensimula.Iterative_process import Iterative_process
-VERSION = "0.7.1"
+from importlib.metadata import version
+VERSION = version("opensimula")