Merge pull request #59 from dvklopfenstein/dev

Modified import to improve runtime speed

Author: dvklopfenstein

.timetracker/.gitignore

@@ -2,6 +2,7 @@
 
 # Summary
 * [**Unreleased**](#unreleased)
+* [**Release 2025-06-21 v0.7a0**](#release-2025-06-21-v07a0) Much added functionality for invoicing
 * [**Release 2025-05-27 v0.6a0**](#release-2025-05-27-v06a0) Added functions to collect various groups of csv files
 * [**Release 2025-05-18 v0.5a7**](#release-2025-05-18-v05a7) Add starttime to `report`; Bug fix in `cancel`
 * [**Release 2025-05-16 v0.5a6**](#release-2025-05-16-v05a6) Add options to `projects` command; Fix `report` command
@@ -30,6 +31,8 @@
 # Details
 
 ## Unreleased
+
+## Release 2025-06-21 v0.7a0
 * ADDED command, `trk invoice`
 * ADDED command option, `-b` or `--billable` to `trk stop`
   to add a `Billable` tag when running `tag stop`
@@ -39,6 +42,7 @@
 * ADDED `--no-git-add` and `-A` options to the `trk init` command
 * CHANGED "Run `trk init`" message so it is clearer that no trk command
   will be run until the project is initialized
+* CHANGED imports to improve speed
 
 ## Release 2025-05-27 v0.6a0
 * ADDED `trk hours` options `--global` to show hours for all projects for a single username

.timetracker/config

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "timetracker-csv"
 description = "Pandas-friendly time tracking from the CLI"
-version = "0.6a0"
+version = "0.7a0"
 license = "AGPL-3.0-or-later"
 authors = [
   {name = 'DV Klopfenstein, PhD', email = 'dvklopfenstein@protonmail.com'},

CHANGELOG.md

@@ -0,0 +1,41 @@
+"""Command line interface (CLI) for timetracking"""
+# https://stackoverflow.com/questions/42703908/how-do-i-use-importlib-lazyloader
+# https://python.plainenglish.io/lazy-imports-the-secret-to-faster-python-code-c33ae9eb1b13
+
+__copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved.'
+__author__ = "DV Klopfenstein, PhD"
+
+
+from timetracker.cmd.init      import cli_run_init
+from timetracker.cmd.start     import cli_run_start
+from timetracker.cmd.stop      import cli_run_stop
+from timetracker.cmd.projects  import cli_run_projects
+from timetracker.cmd.cancel    import cli_run_cancel
+from timetracker.cmd.hours     import cli_run_hours
+from timetracker.cmd.csv       import cli_run_csv
+from timetracker.cmd.report    import cli_run_report
+from timetracker.cmd.invoice    import cli_run_invoice
+from timetracker.cmd.paid       import cli_run_paid
+#from timetracker.cmd.tag       import cli_run_tag
+from timetracker.cmd.activity  import cli_run_activity
+#from timetracker.cmd.csvloc   import cli_run_csvloc
+
+
+FNCS = {
+    'init'     : cli_run_init,
+    'start'    : cli_run_start,
+    'stop'     : cli_run_stop,
+    'cancel'   : cli_run_cancel,
+    'hours'    : cli_run_hours,
+    'csv'      : cli_run_csv,
+    'report'   : cli_run_report,
+    'invoice'  : cli_run_invoice,
+    'paid'     : cli_run_paid,
+    #'tag'      : cli_run_tag,
+    'activity' : cli_run_activity,
+    'projects' : cli_run_projects,
+    #'csvloc'   : cli_run_csvloc,
+}
+
+
+# Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved.

pyproject.toml

@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+"""Test speed savings from lazy import"""
+
+from timeit import default_timer
+from datetime import timedelta
+
+
+def test_tt_fncs(num_p_batch=1):
+    """Test speed savings from lazy import"""
+    # pylint: disable=import-outside-toplevel
+    mintime_slow = timedelta(seconds=1000)
+    for _ in range(num_p_batch):
+        tic = default_timer()
+        import tests.pkgtttest.fncs
+        del tests
+        mintime_slow = min(mintime_slow, timedelta(seconds=default_timer()-tic))
+    print(mintime_slow)
+
+    mintime_fast = timedelta(seconds=1000)
+    for _ in range(num_p_batch):
+        tic = default_timer()
+        import timetracker.cmd.fncs
+        del timetracker
+        mintime_fast = min(mintime_fast, timedelta(seconds=default_timer()-tic))
+    print(mintime_fast)
+
+    assert mintime_fast < mintime_slow
+
+    faster = mintime_slow.total_seconds()/mintime_fast.total_seconds()
+    print(f'{faster:10.1f} times faster is import fncs compared to regular import')
+
+
+def test_tt_ospath(num_p_batch=1):
+    """Test speed savings from lazy import"""
+    # pylint: disable=import-outside-toplevel,too-many-locals
+    mintime_slow = timedelta(seconds=1000)
+    for _ in range(num_p_batch):
+        tic = default_timer()
+        from os.path import exists
+        from os.path import relpath
+        from os.path import abspath
+        from os.path import dirname
+        from os.path import join
+        from os.path import ismount
+        from os.path import basename
+        from os.path import normpath
+        from os.path import realpath
+        from logging import debug
+        from timetracker.consts import DIRTRK
+        del exists
+        del relpath
+        del abspath
+        del dirname
+        del join
+        del ismount
+        del basename
+        del normpath
+        del realpath
+        del debug
+        del DIRTRK
+        mintime_slow = min(mintime_slow, timedelta(seconds=default_timer()-tic))
+    print(mintime_slow)
+
+    mintime_fast = timedelta(seconds=1000)
+    for _ in range(num_p_batch):
+        tic = default_timer()
+        import os.path as os_path
+        del os_path
+        mintime_fast = min(mintime_fast, timedelta(seconds=default_timer()-tic))
+    print(mintime_fast)
+
+    assert mintime_fast < mintime_slow
+
+    faster = mintime_slow.total_seconds()/mintime_fast.total_seconds()
+    print(f'{faster:10.1f} times faster is import fncs compared to regular import')
+
+
+if __name__ == '__main__':
+    test_tt_fncs()
+    test_tt_ospath()

tests/pkgtttest/fncs.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)

tests/test_tt_fncs.py

@@ -2,6 +2,6 @@
 
 __copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved'
 __author__ = 'DV Klopfenstein, PhD'
-__version__ = '0.6a0'
+__version__ = '0.7a0'
 
 # Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved

tests/test_tt_getdt.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