modelflowib 2.84__tar.gz → 2.86__tar.gz

{modelflowib-2.84 → modelflowib-2.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelflowib
-Version: 2.84
+Version: 2.86
 Summary: A tool to solve and manage dynamic economic and financial models
 Author-email: Ib Hansen <Ib.Hansen.Iv@gmail.com>
 License-Expression: MIT
@@ -21,7 +21,6 @@ Requires-Dist: networkx
 Requires-Dist: tqdm
 Requires-Dist: scipy
 Requires-Dist: XlsxWriter
-Requires-Dist: pyarrow
 Requires-Dist: tabulate
 Requires-Dist: openpyxl
 Requires-Dist: xarray
@@ -41,7 +40,9 @@ Requires-Dist: dash; sys_platform != "emscripten"
 Requires-Dist: dash-bootstrap-components; sys_platform != "emscripten"
 Requires-Dist: dash-interactive-graphviz; sys_platform != "emscripten"
 Requires-Dist: plotly; sys_platform != "emscripten"
+Requires-Dist: pyarrow; sys_platform != "emscripten"
 Requires-Dist: jupyter; sys_platform != "emscripten"
+Requires-Dist: jupyterlab-myst; sys_platform != "emscripten"
 Provides-Extra: shiny
 Requires-Dist: shiny; extra == "shiny"
 Requires-Dist: shinywidgets; extra == "shiny"

{modelflowib-2.84 → modelflowib-2.86}/modelclass.py

@@ -2390,7 +2390,7 @@ class Model_help_Mixin():
                         f'&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{blanks} <a href="{githubname}" target="_blank">{name}</a>'))
                 else:
                     display(HTML(
-                        f'&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{blanks} <a href="{notebook}" target="_blank">{name}</a>'))
+                        f'&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{blanks} <a href="{notebook.as_posix()}" target="_blank">{name}</a>'))
                     
 
         
@@ -5246,6 +5246,11 @@ class Graph_Draw_Mixin():
 
 class Display_Mixin():
 
+    #: True: the result viewers (mpak['...'] and .rplot()) are shown as plain html tabs and
+    #: collapsible sections instead of ipywidgets. They then also display where ipywidgets
+    #: containers don't, like RISE slides. Set it for all models with model.plain_html = True
+    plain_html = False
+
     def vis(self, *args, **kwargs):
         ''' Visualize the data of this model instance 
         if the user has another vis class she can place it in _vis, then that will be used'''
@@ -6454,7 +6459,7 @@ class Display_Mixin():
                 title = Display_Mixin._notebook_title(notebook)
                 rows.append(
                     f'<tr><td style="text-align:left;padding:2px 24px 2px {indent+2}em;white-space:nowrap">'
-                    f'<a href="{notebook}" target="_blank">{name}</a></td>'
+                    f'<a href="{notebook.as_posix()}" target="_blank">{name}</a></td>'
                     f'<td style="text-align:left;padding:2px 12px">{title}</td></tr>')
 
                 # try:
@@ -6514,7 +6519,7 @@ class Display_Mixin():
             title = Display_Mixin._notebook_title(fname) if ext == 'ipynb' else ''
             rows.append(
                 f'<tr><td style="text-align:left;padding:2px 24px 2px 12px;white-space:nowrap">'
-                f'<a href="{fname}" target="_blank">{name}</a></td>'
+                f'<a href="{fname.as_posix()}" target="_blank">{name}</a></td>'
                 f'<td style="text-align:left;padding:2px 12px">{title}</td></tr>')
         if rows:
             display(HTML(
@@ -6843,11 +6848,20 @@ class Json_Mixin():
             base.index = base_dates
             return base, current_dates
 
+        def any_case(p):
+            '''p, or else a file in the same folder whose name only differs in case
+            (Windows ignores case, Linux and the browser (JupyterLite) do not)'''
+            if p.exists() or not p.parent.is_dir():
+                return p
+            return next((f for f in p.parent.iterdir() if f.name.lower() == p.name.lower()), p)
+
         pinfile = Path(nname:=infile.replace('\\','/'))
         if not pinfile.suffix:
-            pinfile = pinfile.with_suffix(cls.data_suffix)
-            if not pinfile.exists() and (nodata := pinfile.with_suffix(cls.nodata_suffix)).exists():
+            pinfile = any_case(pinfile.with_suffix(cls.data_suffix))
+            if not pinfile.exists() and (nodata := any_case(pinfile.with_suffix(cls.nodata_suffix))).exists():
                 pinfile = nodata
+        else:
+            pinfile = any_case(pinfile)
 
         def read_file(pinfile):
             try:

{modelflowib-2.84 → modelflowib-2.86}/modelflowib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelflowib
-Version: 2.84
+Version: 2.86
 Summary: A tool to solve and manage dynamic economic and financial models
 Author-email: Ib Hansen <Ib.Hansen.Iv@gmail.com>
 License-Expression: MIT
@@ -21,7 +21,6 @@ Requires-Dist: networkx
 Requires-Dist: tqdm
 Requires-Dist: scipy
 Requires-Dist: XlsxWriter
-Requires-Dist: pyarrow
 Requires-Dist: tabulate
 Requires-Dist: openpyxl
 Requires-Dist: xarray
@@ -41,7 +40,9 @@ Requires-Dist: dash; sys_platform != "emscripten"
 Requires-Dist: dash-bootstrap-components; sys_platform != "emscripten"
 Requires-Dist: dash-interactive-graphviz; sys_platform != "emscripten"
 Requires-Dist: plotly; sys_platform != "emscripten"
+Requires-Dist: pyarrow; sys_platform != "emscripten"
 Requires-Dist: jupyter; sys_platform != "emscripten"
+Requires-Dist: jupyterlab-myst; sys_platform != "emscripten"
 Provides-Extra: shiny
 Requires-Dist: shiny; extra == "shiny"
 Requires-Dist: shinywidgets; extra == "shiny"

{modelflowib-2.84 → modelflowib-2.86}/modelflowib.egg-info/requires.txt

@@ -7,7 +7,6 @@ networkx
 tqdm
 scipy
 XlsxWriter
-pyarrow
 tabulate
 openpyxl
 xarray
@@ -29,7 +28,9 @@ dash
 dash-bootstrap-components
 dash-interactive-graphviz
 plotly
+pyarrow
 jupyter
+jupyterlab-myst
 
 [shiny]
 shiny

{modelflowib-2.84 → modelflowib-2.86}/modelreport.py

@@ -1525,15 +1525,22 @@ class DisplayKeepFigDef(DisplayDef):
         return  [self.out_html ]
     
     
-    @property 
-    def out_html(self):
+    @property
+    def fig_tabwidget(self):
         figlist = {t: htmlwidget_fig(f) for t,f in self.figs.items() }
-        out = tabwidget(figlist,tab=False,selected_index=0)
-        return out.datawidget 
-    
-    
-    # def _ipython_display_(self):
-    #     display(self.out_html)
+        return tabwidget(figlist,tab=False,selected_index=0)
+
+    @property
+    def out_html(self):
+        return self.fig_tabwidget.datawidget
+
+
+    def _ipython_display_(self):
+        # model.plain_html: the charts in plain html sections, which also display where ipywidgets containers don't (RISE)
+        if getattr(self.mmodel, 'plain_html', False):
+            display(HTML(self.fig_tabwidget.html))
+        else:
+            display(self.out_html)
             
         # display(self.out_html)
 

{modelflowib-2.84 → modelflowib-2.86}/modelwidget.py

@@ -15,8 +15,9 @@ import  ipywidgets as widgets
 # except:
 #     ...
 #     print('No ipysheet ')
-from IPython.display import display, clear_output,Latex, Markdown
+from IPython.display import display, clear_output,Latex, Markdown, HTML
 from dataclasses import dataclass,field
+import uuid
 import matplotlib.pylab  as plt 
 
 try:
@@ -41,8 +42,34 @@ class basewidget:
         ''' will update container widgets'''
         for w in self.datachildren:
             w.update_df(df,current_per)
-    
-    
+
+
+def html_tabs(parts, tab=True, selected=0):
+    '''Plain html (no ipywidgets) version of a Tab or an Accordion, used when model.plain_html is True.
+
+    parts: {title: html string}. tab=True gives tabs made of hidden radio buttons, labels and css,
+    tab=False collapsible <details> sections. selected: the index shown first (None: all closed). '''
+    uid = 'mft' + uuid.uuid4().hex[:8]   # unique, so tabs in other outputs are not affected
+    if not tab:
+        # the same name makes the sections exclusive: opening one closes the others
+        return ''.join(f'<details name="{uid}"{" open" if i == selected else ""}>'
+                       f'<summary style="cursor:pointer;font-weight:bold">{title}</summary>{body}</details>'
+                       for i, (title, body) in enumerate(parts.items()))
+    css = [f'#{uid} > input {{display:none}}',
+           f'#{uid} > label {{display:inline-block;padding:4px 12px;margin-right:2px;cursor:pointer;'
+           f'border:1px solid #bbb;border-bottom:none;border-radius:4px 4px 0 0;background:#eee}}',
+           f'#{uid} > div {{display:none;border-top:1px solid #bbb;padding-top:6px}}']
+    head, panels = '', ''
+    for i, (title, body) in enumerate(parts.items()):
+        rid = f'{uid}-{i}'
+        head += (f'<input type="radio" name="{uid}" id="{rid}"{" checked" if i == (selected or 0) else ""}>'
+                 f'<label for="{rid}">{title}</label>')
+        panels += f'<div>{body}</div>'
+        css.append(f'#{rid}:checked + label {{background:#fff;font-weight:bold}}')
+        css.append(f'#{rid}:checked ~ div:nth-of-type({i + 1}) {{display:block}}')
+    return f'<style>{" ".join(css)}</style><div id="{uid}">{head}{panels}</div>'
+
+
 @dataclass
 class tabwidget:
     '''A widget to create tab or acordium contaners'''
@@ -62,8 +89,13 @@ class tabwidget:
          
         for i,key in enumerate(self.tabdefdict.keys()):
            self.datawidget.set_title(i,key)
-           
-           
+
+    @property
+    def html(self):
+        ''' the same container as plain html, see html_tabs '''
+        return html_tabs({key: child.html for key, child in zip(self.tabdefdict.keys(), self.datachildren)},
+                         tab=self.tab, selected=self.selected_index)
+
     def update_df(self,df,current_per):
         ''' will update container widgets'''
         for w in self.datachildren:
@@ -514,6 +546,7 @@ table, th, td {
 
             self.whtml = widgets.HTML(image)
             self.datawidget=widgets.VBox([self.wexp,self.whtml]) if len(self.expname) else self.whtml
+            self.html = (f'<div>{self.expname}</div>' if len(self.expname) else '') + image
 
 
         
@@ -540,6 +573,7 @@ class htmlwidget_fig:
         image = fig_to_image(self.figs,format=self.format)
         self.whtml = widgets.HTML(image)
         self.datawidget=widgets.VBox([self.wexp,self.whtml]) if len(self.expname) else self.whtml
+        self.html = (f'<div>{self.expname}</div>' if len(self.expname) else '') + image
 
 @dataclass
 class htmlwidget_style:
@@ -561,7 +595,8 @@ table, th, td {
 }
 </style>
 """         
-        self.datawidget = widgets.HTML(f'{style_html}{self.styler.to_html()}' )
+        self.html = f'{style_html}{self.styler.to_html()}'
+        self.datawidget = widgets.HTML(self.html)
         
     def display(self):
         # Function to display the widget
@@ -580,9 +615,10 @@ class htmlwidget_label:
         ...
         
         self.wexp  = widgets.Label(value = self.expname,layout={'width':'54%'})
- 
-    
+
+
         self.datawidget=self.wexp
+        self.html = f'<div>{self.expname}</div>'
 
 @dataclass
 class htmlwidget_text:
@@ -593,8 +629,9 @@ class htmlwidget_text:
     
     def __post_init__(self):
         # Initialize the label widget with the provided text
+        self.html = f"<p style='font-family:sans-serif;'>{self.text}</p>"
         self.datawidget = widgets.HTML(
-            value=f"<p style='font-family:sans-serif;'>{self.text}</p>",
+            value=self.html,
             layout={'width': '90%'}
         )
         
@@ -684,10 +721,10 @@ class visshow:
             # print('exo inf  created')
 
         this =   tabwidget(tabnew,selected_index=0)
-        # print('this created ')   
-            
-        
-        self.datawidget = this.datawidget  
+        # print('this created ')
+
+        # model.plain_html: plain html tabs, which also display where ipywidgets containers don't (RISE)
+        self.datawidget = HTML(this.html) if getattr(self.mmodel, 'plain_html', False) else this.datawidget
         if self.show_on:
             ...
             display(self.datawidget)

{modelflowib-2.84 → modelflowib-2.86}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "modelflowib"                       # PyPI distribution name
-version = "2.84"                           # OVERWRITTEN at build time from MF_VERSION
+version = "2.86"                           # OVERWRITTEN at build time from MF_VERSION
                                             # (set_pyproject_version.py / make_pip.py -v)
 description = "A tool to solve and manage dynamic economic and financial models"
 readme = "README.md"
@@ -36,7 +36,6 @@ dependencies = [
     "tqdm",
     "scipy",
     "XlsxWriter",
-    "pyarrow",
     "tabulate",
     "openpyxl",
     "xarray",
@@ -57,7 +56,9 @@ dependencies = [
     "dash-bootstrap-components; sys_platform != 'emscripten'",
     "dash-interactive-graphviz; sys_platform != 'emscripten'",
     "plotly;                    sys_platform != 'emscripten'",   # modeldashsidebar
+    "pyarrow;                   sys_platform != 'emscripten'",   # only .pcimz (large=True) dump/load; not in every Pyodide (0.27 lacks it)
     "jupyter;                   sys_platform != 'emscripten'",   # JupyterLite is the notebook there
+    "jupyterlab-myst;           sys_platform != 'emscripten'",   # MyST markdown (directives, mermaid) in notebook cells; a front-end extension, in JupyterLite it comes from the site build
 ]
 
 [project.optional-dependencies]