p3lib 1.1.122__tar.gz → 1.1.124__tar.gz

{p3lib-1.1.122 → p3lib-1.1.124}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: p3lib
-Version: 1.1.122
+Version: 1.1.124
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 License: MIT
 Author: Paul Austen

{p3lib-1.1.122 → p3lib-1.1.124}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p3lib"
-version = "1.1.122"
+version = "1.1.124"
 description = "A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output."
 authors = ["Paul Austen <pjaos@gmail.com>"]
 license = "MIT License"

{p3lib-1.1.122 → p3lib-1.1.124}/src/p3lib/helper.py

@@ -9,7 +9,6 @@ import platform
 import json
 import traceback
 import socket
-import inspect
 
 def initArgs(parser, lastCmdLineArg=None, checkHostArg=True):
     """This method is responsible for
@@ -389,8 +388,7 @@ def getAbsFile(filename):
         @param filename The name of the icon file.
         @return The abs path of the file or None if not found."""
     file_found = None
-    startup_path = os.getenv("PWD", os.getcwd())
-    abs_filename = os.path.join(startup_path, filename)
+    abs_filename = os.path.abspath(filename)
     if os.path.isfile(abs_filename):
         file_found = abs_filename
 
@@ -412,18 +410,18 @@ def getAbsFile(filename):
             else:
                 # Try all the site packages folders we know about.
                 for path in sys.path:
-                    if 'site-packages' in path:
-                        site_packages_path = path
-                        abs_filename = os.path.join(site_packages_path, filename)
+                    if os.path.isdir(path):
+                        abs_filename = os.path.join(path, filename)
                         if os.path.isfile(abs_filename):
                             file_found = abs_filename
-
                         else:
-                            path3 = os.path.join(site_packages_path, 'assets')
-                            abs_filename = os.path.join(path3, filename)
+                            path2 = os.path.join(path, 'assets')
+                            abs_filename = os.path.join(path2, filename)
                             if os.path.isfile(abs_filename):
                                 file_found = abs_filename
                                 break
+                    if file_found:
+                        break
 
     return file_found
 
@@ -433,84 +431,23 @@ def getProgramVersion():
     """@return The program/package version. This comes from the pyproject.toml file.
                If this file is not found an exception is thrown.  """
     poetryConfigFile = getAbsFile(PYPROJECT_FILE)
-    programVersion = None
-    with open(poetryConfigFile, 'r') as fd:
-        lines = fd.readlines()
-        for line in lines:
-            line=line.strip("\r\n")
-            if line.startswith('version'):
-                elems = line.split("=")
-                if len(elems) == 2:
-                    programVersion = elems[1].strip('" ')
-                    break
-    if programVersion is None:
-        raise Exception(f"Failed to extract program version from '{line}' line of {poetryConfigFile} file.")
+    if poetryConfigFile:
+        programVersion = None
+        with open(poetryConfigFile, 'r') as fd:
+            lines = fd.readlines()
+            for line in lines:
+                line=line.strip("\r\n")
+                if line.startswith('version'):
+                    elems = line.split("=")
+                    if len(elems) == 2:
+                        programVersion = elems[1].strip('" ')
+                        break
+        if programVersion is None:
+            raise Exception(f"Failed to extract program version from '{line}' line of {poetryConfigFile} file.")
+    else:
+        # In the event we can't find the PYPROJECT_FILE file return an invalid verion (hopefully)
+        # to indicate this. This can happen if the pyproject.toml file is not included or can't be
+        # found.
+        return -999.99
     return programVersion
 
-def get_assets_folders():
-    """@return A list of all the assets folders found."""
-    searchFolders = []
-    assetsFolders = []
-    calling_file = None
-    # Get the full path to the python file that called this get_assets_folders() function.
-    frame = inspect.stack()[1]
-    module = inspect.getmodule(frame[0])
-    if module and hasattr(module, '__file__'):
-        calling_file = os.path.abspath(module.__file__)
-
-    if calling_file:
-        startup_path = os.path.dirname(calling_file)
-        searchFolders.append( os.path.join(startup_path, 'assets') )
-        pp1 = os.path.join(startup_path, '..')
-        searchFolders.append( os.path.join(pp1, 'assets') )
-        pp2 = os.path.join(pp1, '..')
-        searchFolders.append( os.path.join(pp2, 'assets') )
-        # Try all the site packages folders we know about.
-        for path in sys.path:
-            if 'site-packages' in path:
-                site_packages_path = path
-                searchFolders.append( os.path.join(site_packages_path, 'assets') )
-
-        for folder in searchFolders:
-            absPath = os.path.abspath(folder)
-            if os.path.isdir(absPath):
-                assetsFolders.append(absPath)
-
-    return assetsFolders
-
-
-def get_assets_folder(raise_error=True):
-    """@brief Get the assests folder.
-       @param raise_error If True then raise an error if the assets folder is not found.
-       @return The abs assets folder path string."""
-    searchFolders = []
-    assetsFolder = None
-    calling_file = None
-    # Get the full path to the python file that called this get_assets_folder() function.
-    frame = inspect.stack()[1]
-    module = inspect.getmodule(frame[0])
-    if module and hasattr(module, '__file__'):
-        calling_file = os.path.abspath(module.__file__)
-
-    if calling_file:
-        startup_path = os.path.dirname(calling_file)
-        searchFolders.append( os.path.join(startup_path, 'assets') )
-        pp1 = os.path.join(startup_path, '..')
-        searchFolders.append( os.path.join(pp1, 'assets') )
-        pp2 = os.path.join(pp1, '..')
-        searchFolders.append( os.path.join(pp2, 'assets') )
-        # Try all the site packages folders we know about.
-        for path in sys.path:
-            if 'site-packages' in path:
-                site_packages_path = path
-                searchFolders.append( os.path.join(site_packages_path, 'assets') )
-
-        for folder in searchFolders:
-            absPath = os.path.abspath(folder)
-            if os.path.isdir(absPath):
-                assetsFolder = absPath
-
-    if raise_error and assetsFolder is None:
-        raise Exception('Failed to find assets folder.')
-
-    return assetsFolder

{p3lib-1.1.122 → p3lib-1.1.124}/src/p3lib/ngt.py

@@ -379,7 +379,13 @@ class TabbedNiceGui(object):
             if isinstance(rxMessage, dict):
                 self._processRXDict(rxMessage)
 
-    def initGUI(self, tabNameList, tabMethodInitList, reload=True, address="0.0.0.0", port=DEFAULT_SERVER_PORT, pageTitle="NiceGUI"):
+    def initGUI(self,
+                tabNameList,
+                tabMethodInitList,
+                reload=True,
+                address="0.0.0.0",
+                port=DEFAULT_SERVER_PORT,
+                pageTitle="NiceGUI"):
         """@brief Init the tabbed GUI.
            @param tabNameList A list of the names of each tab to be created.
            @param tabMethodInitList A list of the methods to be called to init each of the above tabs.
@@ -387,47 +393,53 @@ class TabbedNiceGui(object):
            @param reload If reload is set False then changes to python files will not cause the server to be restarted.
            @param address The address to bind the server to.
            @param The TCP port to bind the server to.
-           @param pageTitle The page title that appears in the browser."""
-        # A bit of defensive programming.
-        if len(tabNameList) != len(tabMethodInitList):
-            raise Exception(f"initGUI: BUG: tabNameList ({len(tabNameList)}) and tabMethodInitList ({len(tabMethodInitList)}) are not the same length.")
-        tabObjList = []
-        with ui.row():
-            with ui.tabs().classes('w-full') as tabs:
-                for tabName in tabNameList:
-                    tabObj = ui.tab(tabName)
-                    tabObjList.append(tabObj)
-
-            with ui.tab_panels(tabs, value=tabObjList[0]).classes('w-full'):
-                for tabObj in tabObjList:
-                    with ui.tab_panel(tabObj):
-                        tabIndex = tabObjList.index(tabObj)
-                        tabMethodInitList[tabIndex]()
-
-        guiLogLevel = "warning"
-        if self._debugEnabled:
-            guiLogLevel = "debug"
-
-        ui.label("Message Log")
-        self._progress = ui.slider(min=0,max=TabbedNiceGui.MAX_PROGRESS_VALUE,step=1)
-        self._progress.set_visibility(False)
-        self._progress.min = 0
-        # Don't allow user to adjust progress bar thumb
-        self._progress.disable()
-        self._log = ui.log(max_lines=2000).classes('my-log')
-        self._log.set_visibility(True)
+           @param pageTitle The page title that appears in the browser.
+           @param maxLogLines The maximum number of lines to be displayed in the log. Be aware setting this higher will cause the browser to use more memory."""
+        with ui.column().classes('h-screen w-screen p4'):
+            # A bit of defensive programming.
+            if len(tabNameList) != len(tabMethodInitList):
+                raise Exception(f"initGUI: BUG: tabNameList ({len(tabNameList)}) and tabMethodInitList ({len(tabMethodInitList)}) are not the same length.")
+            tabObjList = []
+            with ui.row():
+                with ui.tabs().classes('w-full') as tabs:
+                    for tabName in tabNameList:
+                        tabObj = ui.tab(tabName)
+                        tabObjList.append(tabObj)
+
+                with ui.tab_panels(tabs, value=tabObjList[0]).classes('w-full'):
+                    for tabObj in tabObjList:
+                        with ui.tab_panel(tabObj):
+                            tabIndex = tabObjList.index(tabObj)
+                            tabMethodInitList[tabIndex]()
+
+            guiLogLevel = "warning"
+            if self._debugEnabled:
+                guiLogLevel = "debug"
+
+            ui.label("Message Log")
+            self._progress = ui.slider(min=0,max=TabbedNiceGui.MAX_PROGRESS_VALUE,step=1)
+            self._progress.set_visibility(False)
+            self._progress.min = 0
+            # Don't allow user to adjust progress bar thumb
+            self._progress.disable()
+            # Setup the log area to fill the available space in the page vertically and horizontally
+            # The 32px is to make space for the vertical scrollbar within the page or it will be
+            # shifted out of sight to the right.
+            # Previously used self._log = ui.log(max_lines=2000) but the ui.log() does not currently limit data in the log.
+            self._log = ui.log().classes('my-log grow w-full max-w-[calc(100%-32px)] overflow-auto box-border')
+            self._log.set_visibility(True)
 
-        with ui.row():
-            ui.button('Clear Log', on_click=self._clearLog)
-            ui.button('Log Message Count', on_click=self._showLogMsgCount)
-            ui.button('Quit', on_click=self.close)
+            with ui.row():
+                ui.button('Clear Log', on_click=self._clearLog)
+                ui.button('Log Message Count', on_click=self._showLogMsgCount)
+                ui.button('Quit', on_click=self.close)
 
-        with ui.row():
-            ui.label(f"Software Version: {self._programVersion}")
+            with ui.row():
+                ui.label(f"Software Version: {self._programVersion}")
 
-        ui.timer(interval=TabbedNiceGui.GUI_TIMER_SECONDS, callback=self.guiTimerCallback)
-        ui.timer(interval=TabbedNiceGui.PROGRESS_TIMER_SECONDS, callback=self.progressTimerCallback)
-        ui.run(host=address, port=port, title=pageTitle, dark=True, uvicorn_logging_level=guiLogLevel, reload=reload)
+            ui.timer(interval=TabbedNiceGui.GUI_TIMER_SECONDS, callback=self.guiTimerCallback)
+            ui.timer(interval=TabbedNiceGui.PROGRESS_TIMER_SECONDS, callback=self.progressTimerCallback)
+            ui.run(host=address, port=port, title=pageTitle, dark=True, uvicorn_logging_level=guiLogLevel, reload=reload)
 
     def progressTimerCallback(self):
         """@brief Time to update the progress bar. We run the timer all the time because there appears to be a
@@ -947,4 +959,4 @@ class local_file_picker(ui.dialog):
                     selected=selected[1:]
                     selected = self.drives_toggle.value + selected
 
-            self.submit([selected])
+            self.submit([selected])