speedup by lazy import

Author: dvklopfenstein

tests/test_tt_getdt.py

@@ -23,16 +23,18 @@ def test_tt_getdt(fcsv='timetrials_datatime.csv'):
 
 
 def _run(nto):
+    # pylint: disable=too-many-locals
     timedata = []
     #cmp_time = re_compile(r'((\d{1,2}):){0,2}(\d{1,2})\s*(?P<AM_PM>[aApP][mM])')
     # pylint: disable=line-too-long
-    cmp_time = re_compile(r'((?P<hour>\d{1,2})[^-/_](:(?P<minute>\d{1,2}))?[^-/_](:(?P<second>\d{1,2}))?\s*(?P<AM_PM>[aApP][mM])?)')
+    cmp_time = re_compile(r'((?P<hour>\d{1,2})(:(?P<minute>\d{1,2}))?(:(?P<second>\d{1,2}))?\s*(?P<AM_PM>[aApP][mM])?)')
     cmp_date = re_compile(r'((?P<year>\d{4})[-/_]?)?(?P<month>\d{1,2})[-/_](?P<day>\d{1,2})')
     print(f'NOW: {NOW}')
     for timestr, expdct in TIMESTRS.items():
+        # pylint: disable=too-many-locals
         print(f'\nTIMESTR({timestr})')
         tic = default_timer()
-        print("SEARCH FOR TIME:", cmp_time.search(timestr))
+        print("SEARCH FOR TIME:", (m := cmp_time.search(timestr)), m.groupdict() if m else '')
         print("SEARCH FOR DATE:", cmp_date.search(timestr))
         tt0 = timedelta(seconds=default_timer()-tic)
         print(f'{tt0}    re          ({timestr})')  # {dta}')
@@ -46,7 +48,7 @@ def _run(nto):
         tic = default_timer()
         dtb = _conv_datetime(timestr, NOW)
         ttb = timedelta(seconds=default_timer()-tic)
-        #print(f'{ttb}  _conv_datetime({timestr}) {dtb}')
+        print(f'{ttb}  _conv_datetime({timestr}) {dtb}')
 
         tic = default_timer()
         dtc = _conv_timedelta(timestr)

timetracker/cfg/cfg_global.py

@@ -3,20 +3,12 @@
 __copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved.'
 __author__ = "DV Klopfenstein, PhD"
 
-from os.path import isabs
-from os.path import isdir
+import os.path as op
 from os.path import exists
-from os.path import dirname
-from os.path import join
-from os.path import abspath
-from os.path import relpath
 from logging import debug
 from collections import namedtuple
 
-from tomlkit import comment
-from tomlkit import document
-from tomlkit import nl
-from tomlkit import array
+import tomlkit
 from tomlkit.toml_file import TOMLFile
 
 from timetracker.cfg.tomutils import read_config
@@ -101,8 +93,8 @@ def _err_reinit(self, ntcfg):
 
     # -------------------------------------------------------------
     def _chk_global_dir(self):
-        dir_global = dirname(self.filename)
-        if exists(dir_global) and isdir(dir_global) or dir_global == '':
+        dir_global = op.dirname(self.filename)
+        if exists(dir_global) and op.isdir(dir_global) or dir_global == '':
             return
         raise NotADirectoryError(f'{dir_global}\n'
             f'Directory for global config does not exist({dir_global})\n'
@@ -112,7 +104,7 @@ def _chk_global_dir(self):
     def _add_project(self, doc, project, fcfgproj):
         """Add a project to the global config file, if it is not already present"""
         debug('CfgGlobal _add_project(%s, %s)', project, fcfgproj)
-        assert isabs(fcfgproj), f'CfgGlobal._add_project(...) cfg NOT abspath: {fcfgproj}'
+        assert op.isabs(fcfgproj), f'CfgGlobal._add_project(...) cfg NOT abs path: {fcfgproj}'
         debug('CfgGlobal %s', doc)
         # If project is not already in global config
         if self._noproj(doc, project, fcfgproj):
@@ -150,23 +142,23 @@ def _wr_project_init(self, project, fcfgproj):
     def _get_docprt(self, doc):
         doc_cur = doc.copy()
         ##truehome = expanduser('~')
-        dirhome = dirname(self.filename)
+        dirhome = op.dirname(self.filename)
         for idx, (projname, projdir) in enumerate(doc['projects'].unwrap()):
-            ##pdir = relpath(abspath(projdir), truehome)
-            ##pdir = relpath(abspath(projdir), dirhome)
+            ##pdir = op.relpath(op.abspath(projdir), truehome)
+            ##pdir = op.relpath(op.abspath(projdir), dirhome)
             ##if pdir[:2] != '..':
-            if has_homedir(dirhome, abspath(projdir)):
-                ##pdir = join('~', pdir)
-                pdir = join('~', relpath(abspath(projdir), dirhome))
+            if has_homedir(dirhome, op.abspath(projdir)):
+                ##pdir = op.join('~', pdir)
+                pdir = op.join('~', op.relpath(op.abspath(projdir), dirhome))
                 doc_cur['projects'][idx] = [projname, pdir]
                 debug('CFGGLOBAL XXXXXXXXXXX %20s %s', projname, pdir)
         return doc_cur
 
     def _get_new_doc(self):
-        doc = document()
-        doc.add(comment("TimeTracker global configuration file"))
-        doc.add(nl())
-        arr = array()
+        doc = tomlkit.document()
+        doc.add(tomlkit.comment("TimeTracker global configuration file"))
+        doc.add(tomlkit.nl())
+        arr = tomlkit.array()
         arr.multiline(True)
         doc["projects"] = arr
         return doc

timetracker/cfg/cfg_local.py

@@ -9,20 +9,13 @@
 __copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved.'
 __author__ = "DV Klopfenstein, PhD"
 
-from os import makedirs
+import os
+import os.path as op
 from os.path import exists
-from os.path import basename
-from os.path import join
-from os.path import abspath
-from os.path import dirname
-from os.path import normpath
 from logging import debug
 from collections import namedtuple
 
-from tomlkit import comment
-from tomlkit import document
-from tomlkit import nl
-from tomlkit import table
+import tomlkit
 from tomlkit.toml_file import TOMLFile
 
 from timetracker.consts import DIRTRK
@@ -46,19 +39,19 @@ class CfgProj:
     def __init__(self, filename):
         assert filename is not None
         self.filename = filename
-        ####self.exists = exists(self.filename)
         debug('CfgProj args %d filename %s', exists(filename), filename)
-        self.trksubdir = DIRTRK if filename is None else basename(dirname(filename))
-        self.dircfg  = abspath(DIRTRK) if filename is None else normpath(dirname(filename))
-        self.dirproj = dirname(self.dircfg)
+        dnam = op.dirname
+        self.trksubdir = DIRTRK if filename is None else op.basename(dnam(filename))
+        self.dircfg  = op.abspath(DIRTRK) if filename is None else op.normpath(dnam(filename))
+        self.dirproj = dnam(self.dircfg)
 
     def file_exists(self):
         """Return True if config file exists and False otherwise"""
         return exists(self.filename)
 
     def get_filename_cfg(self):
         """Get the full filename of the local config file"""
-        return join(self.dircfg, 'config')
+        return op.join(self.dircfg, 'config')
 
     def get_filename_csv(self, username=None, dirhome=None):
         """Get the csv filename by reading the cfg csv pattern and filling in"""
@@ -98,7 +91,7 @@ def wr_ini_file(self, project=None, dircsv=None, fcfg_global=None):
         fname = self.get_filename_cfg()
         assert not exists(fname)
         if not exists(self.dircfg):
-            makedirs(self.dircfg, exist_ok=True)
+            os.makedirs(self.dircfg, exist_ok=True)
         if dircsv is None:
             dircsv = '.'
         doc = self._get_new_doc(project, dircsv)
@@ -109,7 +102,7 @@ def wr_ini_file(self, project=None, dircsv=None, fcfg_global=None):
     def wr_gitignore(self):
         """Add .gitignore file in .timetracker/ directory"""
         error = None
-        fname = join(self.dircfg, '.gitignore')
+        fname = op.join(self.dircfg, '.gitignore')
         try:
             fptr = open(fname, 'w', encoding='utf-8')
         except (PermissionError, OSError) as err:
@@ -136,10 +129,11 @@ def reinit(self, project, dircsv, fcfg_global=None, ntdoc=None):
             doc['project'] = project
             chgd = True
         if docproj.csv_filename != (csv_new := self._assemble_csv_filepat(dircsv, doc['project'])):
+            dnam = op.dirname
             print('In local project configuration file, changed csv directory:\n'
                   f'   local cfg:  {fname}\n'
-                  f'      csvdir WAS: {dirname(docproj.csv_filename)}\n'
-                  f'      csvdir NOW: {dirname(csv_new)}')
+                  f'      csvdir WAS: {dnam(docproj.csv_filename)}\n'
+                  f'      csvdir NOW: {dnam(csv_new)}')
             doc['csv']['filename'] = csv_new
             chgd = True
         if fcfg_global is not None and docproj.global_config_filename != fcfg_global:
@@ -156,13 +150,13 @@ def reinit(self, project, dircsv, fcfg_global=None, ntdoc=None):
 
     def get_project_from_filename(self):
         """Get the default project name from the project directory filename"""
-        return basename(self.dirproj)
+        return op.basename(self.dirproj)
 
     #-------------------------------------------------------------
     def _assemble_csv_filepat(self, dircsv, project):
         if dircsv is None or dircsv == '':
             dircsv = '.'
-        return join(dircsv, self.CSVPAT.replace('PROJECT', project))
+        return op.join(dircsv, self.CSVPAT.replace('PROJECT', project))
 
     @staticmethod
     def _wr_cfg(fname, doc):
@@ -177,7 +171,7 @@ def _wr_cfg(fname, doc):
         return ret
 
     def _rd_doc(self):
-        """Read a config file and load it into a TOML document"""
+        """Read a config file and load it into a TOML doc"""
         fin_cfglocal = self.get_filename_cfg()
         return TOMLFile(fin_cfglocal).read() if exists(fin_cfglocal) else None
 
@@ -189,7 +183,7 @@ def _get_dircsv(self, dirhome):
         """Read the project cfg to get the csv dir name for storing time data"""
         ##fcsv = self._read_csvdir_from_cfgfile(dirhome)
         ##if fcsv is not None:
-        ##    return dirname(fcsv)
+        ##    return op.dirname(fcsv)
         dircsv = get_abspath(DIRCSV, self.dirproj, dirhome)
         return dircsv
 
@@ -206,17 +200,17 @@ def _get_new_doc(self, project, dircsv):
         assert project is not None and isinstance(project, str)
         #assert dircsv
         debug('TODO: dircsv=%s', dircsv)
-        doc = document()
-        doc.add(comment("TimeTracker project configuration file"))
-        doc.add(nl())
+        doc = tomlkit.document()
+        doc.add(tomlkit.comment("TimeTracker project configuration file"))
+        doc.add(tomlkit.nl())
         doc["project"] = project
 
         # [csv]
         # format = "timetracker_architecting_bez.csv"
-        csv_section = table()
+        csv_section = tomlkit.table()
         #csvdir.comment("Directory where the csv file is stored")
         ##csvpat = self.CSVPAT.replace('PROJECT', project)
-        ##csv_section.add("filename", join(self._get_dircsv_relname(dirhome), csvpat))
+        ##csv_section.add("filename", op.join(self._get_dircsv_relname(dirhome), csvpat))
         csv_section.add("filename", self._assemble_csv_filepat(dircsv, project))
         doc.add("csv", csv_section)
         return doc
@@ -237,7 +231,7 @@ def _update_doc_globalcfgname(self, doc, fcfg_global):
     def _add_doc_globalcfgfname(doc, fcfg_global):
         # [global_config]
         # filename = "/home/uname/myglobal.cfg"
-        section = table()
+        section = tomlkit.table()
         #csvdir.comment("Directory where the csv file is stored")
         section.add("filename", fcfg_global)
         doc.add("global_config", section)

timetracker/cfg/doc_local.py

@@ -9,14 +9,11 @@
 __copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved.'
 __author__ = "DV Klopfenstein, PhD"
 
+import os.path as op
 from os.path import dirname
-from os.path import normpath
-from os.path import basename
 from collections import namedtuple
 from glob import glob
-from timetracker.cfg.utils import get_username
-from timetracker.cfg.utils import get_abspath
-from timetracker.cfg.utils import replace_envvar
+from timetracker.cfg import utils
 from timetracker.cfg.tomutils import read_config
 from timetracker.cfg.docutils import get_ntvalue
 from timetracker.starttime import Starttime
@@ -47,7 +44,7 @@ def __init__(self, doc, filename):
         assert type(doc).__name__ != 'RdCfg'
         assert filename is not None
         self.filename = filename
-        self.dircfg  = normpath(dirname(filename))
+        self.dircfg  = op.normpath(dirname(filename))
         self.project, self.csv_filename, self.global_config_filename, self.errors = \
             self._init_cfg_values(doc)
         self.dircsv = dirname(self.csv_filename) if self.csv_filename else None
@@ -56,24 +53,24 @@ def get_abspath_dircsv(self):
         """Get the absolute pathname for doc['csv']['filename']"""
         dirproj = dirname(self.dircfg)
         if self.dircsv is not None and dirproj is not None:
-            return get_abspath(self.dircsv, dirproj)
+            return utils.get_abspath(self.dircsv, dirproj)
         return None
 
     def get_filename_csv(self, username=None, dirhome=None):
         """Get the csv filename by reading the cfg csv pattern and filling in"""
         assert username is None or '/' not in username
-        username = get_username(username)
+        username = utils.get_username(username)
         return self._get_csvfilename_proj_user(username, dirhome)
 
     def get_filenames_csv(self, dirhome):
         """Get the csv filename by reading the cfg csv pattern and filling in"""
         if (fcsvpat := self._get_csvfilename_proj(dirhome)) is not None:
-            return glob(replace_envvar(fcsvpat, '*'))
+            return glob(utils.replace_envvar(fcsvpat, '*'))
         return None
 
     def get_csv_username(self, fcsv):
         """Using the csv pattern in the project config, determine the username"""
-        bname = basename(self.csv_filename)
+        bname = op.basename(self.csv_filename)
         pc0 = bname.find('$')
         if pc0 == -1:
             return None
@@ -105,21 +102,21 @@ def timer_started(self, username):
     def get_startobj(self, username):
         """Get a Starttime object"""
         if self.project:
-            return Starttime(self.dircfg, self.project, get_username(username))
+            return Starttime(self.dircfg, self.project, utils.get_username(username))
         return None
 
     ##-------------------------------------------------------------
     def _get_csvfilename_proj_user(self, username, dirhome):
         """Read a config file and load it into a TOML document"""
         fcsvpat = self._get_csvfilename_proj(dirhome)
         if fcsvpat:
-            return replace_envvar(fcsvpat, username) if '$' in fcsvpat else fcsvpat
+            return utils.replace_envvar(fcsvpat, username) if '$' in fcsvpat else fcsvpat
         return None
 
     def _get_csvfilename_proj(self, dirhome):
         """Read a config file and load it into a TOML document"""
         if self.csv_filename and self.project:
-            fpat = get_abspath(self.csv_filename, dirname(self.dircfg), dirhome)
+            fpat = utils.get_abspath(self.csv_filename, dirname(self.dircfg), dirhome)
             return fpat.replace('PROJECT', self.project)
         return None