modelflowib 2.79__tar.gz → 2.80__tar.gz

{modelflowib-2.79 → modelflowib-2.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelflowib
-Version: 2.79
+Version: 2.80
 Summary: A tool to solve and manage dynamic economic and financial models
 Author-email: Ib Hansen <Ib.Hansen.Iv@gmail.com>
 License-Expression: MIT

{modelflowib-2.79 → modelflowib-2.80}/modelclass.py

@@ -3907,20 +3907,20 @@ class Graph_Draw_Mixin():
 
     def drawendo(self, **kwargs):
         '''draws a graph of of the whole model'''
-        alllinks = (node(0, n[1], n[0]) for n in self.endograph.edges())
-        return self.todot2(alllinks, **kwargs)
+        alllinks = [node(0, n[1], n[0]) for n in self.endograph.edges()]
+        return self.draw_links(alllinks, **kwargs)
 
     def drawendo_lag_lead(self, **kwargs):
         '''draws a graph of of the whole model'''
-        alllinks = (node(0, n[1], n[0])
-                    for n in self.endograph_lag_lead.edges())
-        return self.todot2(alllinks, **kwargs)
+        alllinks = [node(0, n[1], n[0])
+                    for n in self.endograph_lag_lead.edges()]
+        return self.draw_links(alllinks, **kwargs)
 
     def drawmodel(self, lag=True, **kwargs):
         '''draws a graph of of the whole model'''
         graph = self.totgraph if lag else self.totgraph_nolag
-        alllinks = (node(0, n[1], n[0]) for n in graph.edges())
-        return self.todot2(alllinks, **kwargs)
+        alllinks = [node(0, n[1], n[0]) for n in graph.edges()]
+        return self.draw_links(alllinks, **kwargs)
 
     def plotadjacency(self, size=(5, 5), title='Structure', nolag=False):
         '''
@@ -3970,14 +3970,26 @@ class Graph_Draw_Mixin():
                      self.upwalk(graph, navn.upper(), maxlevel=down, lpre=False,filter=filter))
         return list(chain(uplinks, downlinks))
 
-    def draw(self, navn, down=1, up=1, lag=False, endo=False, filter=0, engine='dot', **kwargs):
+    # in a browser (jupyterlite) there is no graphviz program, and the svg drawing
+    # is the one which can be zoomed and has tooltips
+    if sys.platform == 'emscripten':
+        #: the engine of draw: dot for graphviz, else an engine of draw_nx
+        draw_engine = 'svg'
+        #: the engine of draw_nx: mpl for matplotlib or svg
+        nx_engine = 'svg'
+    else:
+        draw_engine = 'dot'
+        nx_engine = 'mpl'
+
+    def draw(self, navn, down=1, up=1, lag=False, endo=False, filter=0, engine='', **kwargs):
         '''draws a graph of dependensies of navn up to maxlevel
 
         :lag: show the complete graph including lagged variables else only variables.
         :endo: Show only the graph for current endogenous variables
         :down: level downstream
         :up: level upstream
-        :engine: dot draws with graphviz, mpl and svg are the engines of draw_nx
+        :engine: dot draws with graphviz, mpl and svg are the engines of draw_nx,
+                 default self.draw_engine which is svg in a browser else dot
 
         If graphviz fails - the dot program is for instance not there when running
         in a browser - or if self.no_graphviz is True, draw_nx draws the graph
@@ -3985,19 +3997,40 @@ class Graph_Draw_Mixin():
         '''
         alllinks = self.get_alllinks(navn, down=down, up=up, lag=lag, endo=endo,
                                       filter=filter)
-        # dot=True means the caller wants the dot source, for instance the dash apps,
-        # then no_graphviz is not respected, as networkx can not make a dot file
-        if engine == 'dot' and (not self.no_graphviz or kwargs.get('dot', False)):
+        return self.draw_links(alllinks, navn=navn.upper(), engine=engine,
+                               down=down, up=up, filter=filter, **kwargs)
+
+    def draw_links(self, alllinks, navn='', engine='', **kwargs):
+        '''Draws the links from get_alllinks, drawmodel, drawendo ... with the engine
+
+        :engine: dot draws with graphviz, mpl and svg are the engines of draw_nx,
+                 default self.draw_engine which is svg in a browser else dot
+
+        If graphviz fails - the dot program is for instance not there when running
+        in a browser - or if self.no_graphviz is True, networkx draws the graph.
+        '''
+        if kwargs.get('dot', False):
+            # the caller wants the dot source itself, for instance the dash apps.
+            # The dot program is not needed for that, and networkx can not make it
+            return self.todot2(alllinks, navn=navn, **kwargs)
+
+        engine = engine or self.draw_engine
+        if engine == 'dot' and not self.no_graphviz:
             try:
-                return self.todot2(alllinks, navn=navn.upper(), down=down, up=up, filter = filter, **kwargs)
+                return self.todot2(alllinks, navn=navn, **kwargs)
             except Exception as e:
                 print(f'Graphviz did not draw the graph: {e}\nDrawing with networkx')
-                engine = 'mpl'
+                engine = self.nx_engine
         elif engine == 'dot':
-            engine = 'mpl'   # no_graphviz is set, then networkx draws the graph
+            engine = self.nx_engine   # no_graphviz is set, then networkx draws it
 
-        return self.draw_nx(navn, down=down, up=up, lag=lag, endo=endo, filter=filter,
-                            alllinks=alllinks, engine=engine, **kwargs)
+        if not len(alllinks):
+            print(f'No graph {navn}')
+            if kwargs.get('filter', 0):
+                print('Perhaps filter prunes to much')
+            return
+        G = self.alllinks_to_nx(alllinks, navn=navn, **kwargs)
+        return self.display_nx(G, navn=navn, engine=engine, **kwargs)
 
     #: Set to True on a model instance to make draw use draw_nx, so the networkx
     #: drawing can be tested on a machine where graphviz works
@@ -4085,18 +4118,26 @@ class Graph_Draw_Mixin():
                 except Exception:
                     G.nodes[v]['values'] = None
 
-        # the layer is the distance to navn, so the drawing can be layered like rankdir=LR
+        # the layer places the node in a column, so the drawing is layered like rankdir=LR
         if navn in G:
+            # the layer is the distance to navn, upstream to the left of it
             upstream = nx.single_source_shortest_path_length(G.reverse(copy=False), navn)
             downstream = nx.single_source_shortest_path_length(G, navn)
+            for v in G.nodes:
+                up_len, down_len = upstream.get(v), downstream.get(v)
+                if up_len is not None and (down_len is None or up_len <= down_len):
+                    G.nodes[v]['layer'] = -up_len
+                else:
+                    G.nodes[v]['layer'] = 0 if down_len is None else down_len
         else:
-            upstream, downstream = {}, {}
-        for v in G.nodes:
-            up_len, down_len = upstream.get(v), downstream.get(v)
-            if up_len is not None and (down_len is None or up_len <= down_len):
-                G.nodes[v]['layer'] = -up_len
-            else:
-                G.nodes[v]['layer'] = 0 if down_len is None else down_len
+            # no variable in the center, like drawmodel, then the layer is the logical
+            # order. The simultaneous blocks are condensed to one node, else there is
+            # no order, and a node of such a block gets the layer of its block
+            condensed = nx.condensation(G)
+            for layer, blocks in enumerate(nx.topological_generations(condensed)):
+                for block in blocks:
+                    for v in condensed.nodes[block]['members']:
+                        G.nodes[v]['layer'] = layer
 
         for child, parent in G.edges:
             try:
@@ -4166,23 +4207,21 @@ class Graph_Draw_Mixin():
         if alllinks is None:
             alllinks = self.get_alllinks(navn, down=down, up=up, lag=lag, endo=endo,
                                           filter=filter)
-        if not len(alllinks):
-            print(f'No graph {navn}')
-            if filter:
-                print('Perhaps filter prunes to much')
-            return
-        G = self.alllinks_to_nx(alllinks, navn=navn.upper(), **kwargs)
-        return self.display_nx(G, navn=navn.upper(), **kwargs)
+        engine = kwargs.pop('engine', '') or self.nx_engine
+        return self.draw_links(alllinks, navn=navn.upper(), engine=engine,
+                               down=down, up=up, filter=filter, **kwargs)
 
-    def display_nx(self, G, navn='', engine='mpl', **kwargs):
+    def display_nx(self, G, navn='', engine='', **kwargs):
         '''Draws a graph made by alllinks_to_nx
 
-        :engine: mpl draws with matplotlib, svg makes a svg drawing
+        :engine: mpl draws with matplotlib, svg makes a svg drawing,
+                 default self.nx_engine which is svg in a browser else mpl
 
         Each engine is the method display_nx_<engine>, so a new engine is made by
         writing a new method. They all take the same graph and the positions from
         nx_layout, and only do the drawing itself.
         '''
+        engine = engine or self.nx_engine
         try:
             displayer = getattr(self, f'display_nx_{engine}')
         except AttributeError:
@@ -4330,7 +4369,12 @@ class Graph_Draw_Mixin():
             svgname.write_text(svg, encoding='utf-8')
             if browser:
                 # the same as display_graph, a separate window where the svg can be zoomed
-                wb.open(f'file://{svgname.resolve()}', new=2)
+                try:
+                    wb.open(f'file://{svgname.resolve()}', new=2)
+                except Exception as e:
+                    # in a browser (jupyterlite) there is no window to open from
+                    print(f'No separate window here: {e}')
+                    print(f'The drawing is saved as {svgname} and is shown below')
 
         display(HTML(svg))
         self.last_svg = svg

{modelflowib-2.79 → modelflowib-2.80}/modelflowib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelflowib
-Version: 2.79
+Version: 2.80
 Summary: A tool to solve and manage dynamic economic and financial models
 Author-email: Ib Hansen <Ib.Hansen.Iv@gmail.com>
 License-Expression: MIT

{modelflowib-2.79 → modelflowib-2.80}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "modelflowib"                       # PyPI distribution name
-version = "2.79"                           # OVERWRITTEN at build time from MF_VERSION
+version = "2.80"                           # 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"