runtimepy 4.2.1__tar.gz → 4.2.2__tar.gz

{runtimepy-4.2.1/runtimepy.egg-info → runtimepy-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runtimepy
-Version: 4.2.1
+Version: 4.2.2
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,10 +17,10 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: psutil
 Requires-Dist: vcorelib>=3.2.4
 Requires-Dist: svgen>=0.6.6
 Requires-Dist: websockets
-Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -44,11 +44,11 @@ Requires-Dist: uvloop; (sys_platform != "win32" and sys_platform != "cygwin") an
     =====================================
     generator=datazen
     version=3.1.4
-    hash=ebb5664a436fde952d2499fe582fccd3
+    hash=5f56531d1be3002a8547ddb013d713f9
     =====================================
 -->
 
-# runtimepy ([4.2.1](https://pypi.org/project/runtimepy/))
+# runtimepy ([4.2.2](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-4.2.1 → runtimepy-4.2.2}/README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=ebb5664a436fde952d2499fe582fccd3
+    hash=5f56531d1be3002a8547ddb013d713f9
     =====================================
 -->
 
-# runtimepy ([4.2.1](https://pypi.org/project/runtimepy/))
+# runtimepy ([4.2.2](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-4.2.1 → runtimepy-4.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "runtimepy"
-version = "4.2.1"
+version = "4.2.2"
 description = "A framework for implementing Python services."
 readme = "README.md"
 requires-python = ">=3.11"

{runtimepy-4.2.1 → runtimepy-4.2.2}/runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=dce9eddca4f19e277a7cac5df515e475
+# hash=9427b9a1aadbcbc5e128b88c10b37dbe
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "4.2.1"
+VERSION = "4.2.2"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

{runtimepy-4.2.1 → runtimepy-4.2.2}/runtimepy/data/js/classes/TabFilter.js

@@ -15,6 +15,8 @@ class TabFilter {
   }
 
   updateStyles(pattern) {
+    hash.setTabFilter(pattern);
+
     if (!pattern) {
       pattern = ".*";
     }

{runtimepy-4.2.1 → runtimepy-4.2.2}/runtimepy/data/js/classes/TabInterface.js

@@ -71,6 +71,8 @@ class TabInterface {
   }
 
   updateChannelStyles(pattern) {
+    hash.handleChannelFilter(this.name, pattern);
+
     if (!pattern) {
       pattern = ".*";
     }
@@ -96,6 +98,7 @@ class TabInterface {
       } else {
         curr += event.key;
       }
+
       this.updateChannelStyles(curr);
     }
   }

{runtimepy-4.2.1 → runtimepy-4.2.2}/runtimepy/data/js/classes/WindowHashManager.js

@@ -4,9 +4,11 @@ class WindowHashManager {
     this.original = this.hash();
 
     this.tab = "";
+    this.tabFilter = "";
     this.tabsShown = true;
     this.channelsShown = true;
     this.plotChannels = {};
+    this.filters = {};
   }
 
   tabClick(event) {
@@ -29,6 +31,11 @@ class WindowHashManager {
     this.update();
   }
 
+  handleChannelFilter(tabName, value) {
+    this.filters[tabName] = value;
+    this.update();
+  }
+
   handlePlotChannelToggle(tabName, channel, state) {
     /* Service settings modal. */
     if (modalManager) {
@@ -51,6 +58,29 @@ class WindowHashManager {
     }
   }
 
+  setTabFilter(value) {
+    this.tabFilter = value;
+    this.update();
+  }
+
+  updateTabFilter(value) {
+    this.tabFilter = value;
+    if (tabFilter) {
+      tabFilter.input.value = value;
+      tabFilter.updateStyles(value);
+    }
+  }
+
+  setTabChannelFilter(tabName, value) {
+    this.filters[tabName] = value;
+
+    let elem = tabs[tabName].query("#channel-filter");
+    if (elem) {
+      elem.value = value;
+      tabs[tabName].updateChannelStyles(value);
+    }
+  }
+
   clearPlotChannels(tabName) {
     if (tabName in this.plotChannels) {
       let channels = this.plotChannels[tabName];
@@ -85,7 +115,16 @@ class WindowHashManager {
       for (let i = 1; i < boolsChannels.length; i++) {
         let nameChannels = boolsChannels[i].split(":");
         for (let chan of nameChannels[1].split(",")) {
-          this.togglePlotChannel(nameChannels[0], chan);
+          if (!chan.includes("=")) {
+            /* Handle regular channel names. */
+            this.togglePlotChannel(nameChannels[0], chan);
+          } else {
+            /* Handle key-value pairs. */
+            let keyVal = chan.split("=");
+            if (keyVal.length == 2 && keyVal[0] == "filter" && keyVal[1]) {
+              this.setTabChannelFilter(nameChannels[0], keyVal[1]);
+            }
+          }
         }
       }
 
@@ -95,6 +134,16 @@ class WindowHashManager {
       if (split.includes("hide-channels")) {
         channelsButton.click();
       }
+
+      /* Check for tab filter. */
+      for (let item of split) {
+        if (item.includes("=")) {
+          let keyVal = item.split("=");
+          if (keyVal.length == 2 && keyVal[0] == "filter" && keyVal[1]) {
+            this.updateTabFilter(keyVal[1]);
+          }
+        }
+      }
     }
   }
 
@@ -109,6 +158,9 @@ class WindowHashManager {
   update() {
     let hash = this.tab;
 
+    if (this.tabFilter) {
+      hash += ",filter=" + this.tabFilter;
+    }
     if (!this.tabsShown) {
       hash += ",hide-tabs"
     }
@@ -116,22 +168,40 @@ class WindowHashManager {
       hash += ",hide-channels"
     }
 
-    for (let tab in this.plotChannels) {
+    for (let tab in tabs) {
       let firstChan = true;
-      let channels = this.plotChannels[tab];
-      for (let name in channels) {
-        if (channels[name]) {
-          if (firstChan) {
-            hash += "/" + tab + ":"
-            firstChan = false;
-          }
 
-          if (hash.slice(-1) != ":") {
-            hash += ",";
+      /* Write plot channels if present. */
+      if (tab in this.plotChannels) {
+        let channels = this.plotChannels[tab];
+
+        for (let name in channels) {
+          if (channels[name]) {
+            if (firstChan) {
+              hash += "/" + tab + ":"
+              firstChan = false;
+            }
+
+            if (hash.slice(-1) != ":") {
+              hash += ",";
+            }
+            hash += name;
           }
-          hash += name;
         }
       }
+
+      /* Write tab filter if present. */
+      if (tab in this.filters && this.filters[tab]) {
+        if (firstChan) {
+          hash += "/" + tab + ":"
+          firstChan = false;
+        }
+
+        if (hash.slice(-1) != ":") {
+          hash += ",";
+        }
+        hash += "filter=" + this.filters[tab];
+      }
     }
 
     window.location.hash = hash;

{runtimepy-4.2.1 → runtimepy-4.2.2}/runtimepy/data/js/util.js

@@ -22,6 +22,8 @@ function worker_config(config) {
   return worker_cfg;
 }
 
+let tabFilter = undefined;
+
 function bootstrap_init() {
   /*
    * Enable tooltips.
@@ -34,6 +36,6 @@ function bootstrap_init() {
   /* Initialize tab filter. */
   let tabs = document.getElementById("runtimepy-tabs");
   if (tabs) {
-    const tabFilter = new TabFilter(tabs);
+    tabFilter = new TabFilter(tabs);
   }
 }

{runtimepy-4.2.1 → runtimepy-4.2.2/runtimepy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runtimepy
-Version: 4.2.1
+Version: 4.2.2
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,10 +17,10 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: psutil
 Requires-Dist: vcorelib>=3.2.4
 Requires-Dist: svgen>=0.6.6
 Requires-Dist: websockets
-Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -44,11 +44,11 @@ Requires-Dist: uvloop; (sys_platform != "win32" and sys_platform != "cygwin") an
     =====================================
     generator=datazen
     version=3.1.4
-    hash=ebb5664a436fde952d2499fe582fccd3
+    hash=5f56531d1be3002a8547ddb013d713f9
     =====================================
 -->
 
-# runtimepy ([4.2.1](https://pypi.org/project/runtimepy/))
+# runtimepy ([4.2.2](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)