d3graph 2.8.1__tar.gz → 2.8.2__tar.gz

{d3graph-2.8.1/d3graph.egg-info → d3graph-2.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d3graph
-Version: 2.8.1
+Version: 2.8.2
 Summary: Python package to create interactive network based on d3js.
 Author-email: Erdogan Taskesen <erdogant@gmail.com>
 License-Expression: BSD-3-Clause

{d3graph-2.8.1 → d3graph-2.8.2}/d3graph/__init__.py

@@ -17,7 +17,7 @@ from d3graph.d3graph import (
 
 __author__ = 'Erdogan Tasksen'
 __email__ = 'erdogant@gmail.com'
-__version__ = '2.8.1'
+__version__ = '2.8.2'
 
 # Setup root logger
 _logger = logging.getLogger('d3graph')

{d3graph-2.8.1 → d3graph-2.8.2}/d3graph/d3graph.py

@@ -485,8 +485,10 @@ class d3graph:
         node_names = self.adjmat.columns.astype(str)
         nodecount = self.adjmat.shape[0]
         group = np.zeros_like(node_names).astype(int)
+
         # Check validity of color.
         color = _check_hex_color(color, nodecount, cmap=cmap)
+
         # Store in config
         self.config['cmap'] = 'Paired' if cmap is None else cmap
         self.config['node_scaler'] = scaler
@@ -1621,18 +1623,21 @@ def adjmat2vec(adjmat, min_weight: float = 1.0) -> pd.DataFrame:
 def _check_hex_color(color, n=None, cmap='Set1'):
     seq_types = (list, np.ndarray, pd.Series, StringArray)
 
+    if isinstance(color, str) and color=='cluster':
+        return 'cluster'
+
     # Single string
     if isinstance(color, str):
         if len(color) != 7 or not color.startswith('#'):
-            logger.warning('Invalid [color] format. Expected "#000000" <auto-fixing>')
-            return get_hex_color(color, cmap=cmap)[0]
+            logger.warning('1. Invalid [color] format. Expected "#000000" <auto-fixing>')
+            return get_hex_color([color]*n, cmap=cmap)[0]
         return color
 
     # Sequence input
     if isinstance(color, seq_types):
 
         if len(color) == 0:
-            logger.warning('Invalid [color] sequence. Expected ["#000000", ...] <auto-fixing>')
+            logger.warning('2. Invalid [color] sequence. Expected ["#000000", ...] <auto-fixing>')
             return get_hex_color(color, cmap=cmap)[0]
 
         valid = np.all([
@@ -1641,11 +1646,11 @@ def _check_hex_color(color, n=None, cmap='Set1'):
         ])
 
         if not valid:
-            logger.warning('Invalid hex colors in [color]. Expected ["#000000", ...] <auto-fixing>')
+            logger.warning('3. Invalid hex colors in [color]. Expected ["#000000", ...] <auto-fixing>')
             return get_hex_color(color, cmap=cmap)[0]
 
         if (n is not None) and (len(color) != n):
-            logger.warning(f'Invalid [color] length. Expected length={n} <auto-fixing>')
+            logger.warning(f'4. Invalid [color] length. Expected length={n} <auto-fixing>')
             return get_hex_color(color, cmap=cmap)[0]
 
     return color

{d3graph-2.8.1 → d3graph-2.8.2}/d3graph/examples.py

@@ -1,3 +1,28 @@
+# %% SET PATH ISSUE https://github.com/erdogant/d3graph/issues/42
+from pathlib import Path
+from d3graph import d3graph, vec2adjmat, import_example
+output_path = Path.cwd() / 'd3graph.html'
+
+# Load example data
+df = import_example('stormofswords')
+adjmat = vec2adjmat(source=df['source'], target=df['target'], weight=df['weight'])
+
+
+# sticky=True (default) — drag to pin, right-click to release
+d3 = d3graph(sticky=True)
+d3.set_path(output_path)
+d3.config['filepath']
+
+d3.graph(adjmat)
+d3.show()
+
+# sticky=False — classic spring-back behaviour
+d3 = d3graph(adjmat, sticky=False)
+d3.show()
+
+# %%
+
+
 from d3graph import d3graph, import_example, vec2adjmat
 
 d3 = d3graph()

{d3graph-2.8.1 → d3graph-2.8.2/d3graph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d3graph
-Version: 2.8.1
+Version: 2.8.2
 Summary: Python package to create interactive network based on d3js.
 Author-email: Erdogan Taskesen <erdogant@gmail.com>
 License-Expression: BSD-3-Clause