p3lib 1.1.58__py3-none-any.whl → 1.1.60__py3-none-any.whl

p3lib/bokeh_gui.py

@@ -461,7 +461,7 @@ class SingleAppServer(object):
               the freedom to define your app as required."""
 
     @staticmethod
-    def GetNextUnusedPort(basePort=1024, maxPort = 65534, bindAddress="localhost"):
+    def GetNextUnusedPort(basePort=1024, maxPort = 65534, bindAddress="0.0.0.0"):
         """@brief Get the first unused above the base port.
            @param basePort The port to start checking for available ports.
            @param maxPort The highest port number to check.
@@ -739,3 +739,82 @@ class GUIModel_A(SingleAppServer):
         if time() > self._lastUpdateTime+10:
             self._debug("Updating GUI: Outstanding messages = {}".format( self._plotDataQueue.qsize()) )
             self._lastUpdateTime = time()
+
+
+class MultiAppServer(object):
+    """@brief Responsible for running a bokeh server containing a multiple apps.
+              The server may be started by calling either a blocking or a non
+              blocking method. This provides a basic parent class with
+              the freedom to define your app as required."""
+
+    BOKEH_ALLOW_WS_ORIGIN       = 'BOKEH_ALLOW_WS_ORIGIN'
+
+    @staticmethod
+    def GetNextUnusedPort(basePort=1024, maxPort = 65534, bindAddress="0.0.0.0"):
+        """@brief A helper method to get the first unused above the base port.
+           @param basePort The port to start checking for available ports.
+           @param maxPort The highest port number to check.
+           @param bindAddress The address to bind to.
+           @return The TCP port or -1 if no port is available."""
+        return SingleAppServer.GetNextUnusedPort(basePort=basePort, maxPort=maxPort, bindAddress=bindAddress)
+
+    def __init__(self, address="0.0.0.0", bokehPort=0, wsOrigin="*:*"):
+        """@Constructor
+           @param address The address of the bokeh server.
+           @param bokehPort The TCP port to run the server on. If left at the default
+                  of 0 then a spare TCP port will be used.
+           """
+        if bokehPort == 0:
+            bokehPort = MultiAppServer.GetNextUnusedPort()
+        self._bokehPort=bokehPort
+        self._address=address
+        os.environ[MultiAppServer.BOKEH_ALLOW_WS_ORIGIN]=wsOrigin
+
+    def getServerPort(self):
+        """@return The bokeh server port."""
+        return self._bokehPort
+
+    def _getAppDict(self, appMethodDict):
+        """@brief Get a dict that can be passed to the Server object to
+                  define the apps to be served."""
+        appDict = {}
+        for key in appMethodDict:
+            appMethod = appMethodDict[key]
+            appDict[key]=Application(FunctionHandler(appMethod))
+        return appDict
+
+    def runBlockingBokehServer(self, appMethodDict, openBrowser=True):
+        """@brief Run the bokeh server. This method will only return when the server shuts down.
+           @param appMethodDict This dict holds references to all the apps yourwish the server
+           to run.
+           The key to each dict entry should be the last part of the URL to point to the app.
+           E.G '/' is the root app which is displayed when the full URL is given.
+           The value should be a reference to the method on this object that holds
+           the app code.
+           @param openBrowser If True then open a browser connected to the / app (default=True)."""
+        appDict = self._getAppDict(appMethodDict)
+
+        #As this gets run in a thread we need to start an event loop
+        evtLoop = asyncio.new_event_loop()
+        asyncio.set_event_loop(evtLoop)
+        self._server = Server(appDict, address=self._address, port=self._bokehPort)
+        self._server.start()
+        if openBrowser:
+            #Show the server in a web browser window
+            self._server.io_loop.add_callback(self._server.show, "/")
+        self._server.io_loop.start()
+
+    def runNonBlockingBokehServer(self, appMethodDict, openBrowser=True):
+        """@brief Run the bokeh server in a separate thread. This is useful
+                  if the we want to load realtime data into the plot from the
+                  main thread.
+           @param @param appMethodDict This dict holds references to all the apps yourwish the server
+           to run.
+           The key to each dict entry should be the last part of the URL to point to the app.
+           E.G '/' is the root app which is displayed when the full URL is given.
+           The value should be a reference to the method on this object that holds
+           the app code.
+           @param openBrowser If True then open a browser connected to the / app (default=True)"""
+        self._serverThread = threading.Thread(target=self.runBlockingBokehServer, args=(appMethodDict,openBrowser))
+        self._serverThread.setDaemon(True)
+        self._serverThread.start()

p3lib/database_if.py

@@ -207,7 +207,6 @@ class DatabaseIF(object):
         cmd = "SELECT COUNT(*) as count from {};".format(tableName)
         retList = self.executeSQL(cmd)
         if len(retList) > 0:
-            print()
             count = retList[0]['count']
         return count
     

{p3lib-1.1.58.dist-info → p3lib-1.1.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.58
+Version: 1.1.60
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.58.dist-info → p3lib-1.1.60.dist-info}/RECORD

@@ -1,8 +1,8 @@
 p3lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p3lib/bokeh_gui.py,sha256=IOHZHiWvrF4V1lKS5D8PgsjTx-HQKNhSdp1FjonyqW8,34863
+p3lib/bokeh_gui.py,sha256=8KhIGv6GrbbzOLm97hXSSKymDaR0ambg0-1ZSFgD0G4,38903
 p3lib/boot_manager.py,sha256=Gx7A8gdRHnpvk1sh5k4lixJQSCxA4TKCe-qGmJYWtyI,12650
 p3lib/conduit.py,sha256=jPkjdtyCx2I6SFqcEo8y2g7rgnZ-jNY7oCuYIETzT5Q,6046
-p3lib/database_if.py,sha256=Py-Y5FKgDVnqEV7Xd87_L2MLLpOqSXUFsmI1lba6P8Y,11917
+p3lib/database_if.py,sha256=mgTdSeCTQs1V10E7KuyK3xRkdaU3RXrqYpMQvosrA_M,11897
 p3lib/helper.py,sha256=-B63_ncfchMwXrvyVcnj9sxwGnMJ3ASmLmpoYa4tBmM,11862
 p3lib/json_networking.py,sha256=6u4s1SmypjTYPnSxHP712OgQ3ZJaxOqIkgHQ1J7Qews,9738
 p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
@@ -11,8 +11,8 @@ p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
 p3lib/pconfig.py,sha256=_ri9w3aauHXZp8u2YLYHBVroFR_iCqaTCwj_MRa3rHo,30153
 p3lib/ssh.py,sha256=YE1ddgiEt9EeBM8evuxCV8Gnj4jz1Sv52vEKidvjrJA,38369
 p3lib/uio.py,sha256=S3yrPADLJeXOJeBXC4RBA47Ef3BIldLzDBItQoj1agA,20911
-p3lib-1.1.58.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.58.dist-info/METADATA,sha256=c53RuK4oFgIx-v_iin3_OvHjlyh9hkGY5AxxqwLFWYA,924
-p3lib-1.1.58.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-p3lib-1.1.58.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
-p3lib-1.1.58.dist-info/RECORD,,
+p3lib-1.1.60.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.60.dist-info/METADATA,sha256=T670NYVhGo0a_bR4Kp1H52TvArcrxEHrSQ99jx_Q7Ig,924
+p3lib-1.1.60.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+p3lib-1.1.60.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
+p3lib-1.1.60.dist-info/RECORD,,