fmtr.tools 1.3.38__py3-none-any.whl → 1.3.40__py3-none-any.whl

fmtr/tools/google_api_tools.py

@@ -1,3 +1,4 @@
+from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
@@ -20,8 +21,12 @@ class Authenticator:
 
     @classmethod
     def auth(cls):
-        msg = f'Doing auth for service {cls.SERVICE} ({cls.VERSION})...'
-        logger.info(msg)
+        """
+
+        Do initial authentication or refresh token if expired.
+
+        """
+        logger.info(f'Doing auth for service {cls.SERVICE} ({cls.VERSION})...')
 
         PATH_CREDS = cls.PATH / 'credentials.json'
         PATH_TOKEN = cls.PATH / f'{cls.SERVICE}.json'
@@ -29,9 +34,15 @@ class Authenticator:
         if PATH_TOKEN.exists():
             data_token = PATH_TOKEN.read_json()
             credentials = Credentials.from_authorized_user_info(data_token, cls.SCOPES)
+            if credentials.expired:
+                with logger.span(f'Credentials expired for {cls.SERVICE}. Will refresh...'):
+                    logger.warning(f'{cls.SERVICE}. {PATH_CREDS.exists()=} {PATH_TOKEN.exists()=} {credentials.valid=} {credentials.expired=} {credentials.expiry=}')
+                    credentials.refresh(Request())
+                    PATH_TOKEN.write_text(credentials.to_json())
         else:
             flow = InstalledAppFlow.from_client_secrets_file(PATH_CREDS, cls.SCOPES)
+            flow.authorization_url(prompt='consent', access_type='offline')
             credentials = flow.run_local_server(open_browser=False, port=cls.PORT)
             PATH_TOKEN.write_text(credentials.to_json())
-        service = build(cls.SERVICE, cls.VERSION, credentials=credentials)
-        return service
+
+        return build(cls.SERVICE, cls.VERSION, credentials=credentials)

fmtr/tools/interface_tools/__init__.py

@@ -3,5 +3,6 @@ from fmtr.tools.import_tools import MissingExtraMockModule
 try:
     from fmtr.tools.interface_tools.interface_tools import Interface, update, progress
     from fmtr.tools.interface_tools import controls
+    from fmtr.tools.interface_tools.context import Context
 except ImportError as exception:
     Interface = update = progress = controls = MissingExtraMockModule('interface', exception)

fmtr/tools/interface_tools/context.py

@@ -0,0 +1,12 @@
+from flet.core.page import Page
+
+from fmtr.tools.data_modelling_tools import Base, MixinArbitraryTypes
+
+
+class Context(Base, MixinArbitraryTypes):
+    """
+
+    Base context class
+
+    """
+    page: Page

fmtr/tools/interface_tools/interface_tools.py

@@ -1,12 +1,13 @@
-from functools import cached_property
-
 import flet as ft
 from flet.core.types import AppView
 from flet.core.view import View
+from functools import cached_property
+from typing import TypeVar, Generic, Type
 
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
 from fmtr.tools.function_tools import MethodDecorator
+from fmtr.tools.interface_tools.context import Context
 from fmtr.tools.logging_tools import logger
 
 
@@ -55,9 +56,10 @@ class progress(update):
         super().stop(instance)
 
 
+T = TypeVar('T', bound=Context)
 
 
-class Interface(ft.Column):
+class Interface(Generic[T], ft.Column):
     """
 
     Simple interface base class.
@@ -72,12 +74,15 @@ class Interface(ft.Column):
     ROUTE_ROOT = '/'
     SCROLL = ft.ScrollMode.AUTO
 
-    def __init__(self, *args, **kwargs):
+    TypeContext: Type[T] = Context
+
+    def __init__(self, context: T, *args, **kwargs):
         """
 
         Instantiate and apply interface config
 
         """
+        self.context = context
         super().__init__(*args, **kwargs, scroll=self.SCROLL)
 
     @classmethod
@@ -88,9 +93,11 @@ class Interface(ft.Column):
 
         """
         if not page.on_route_change:
+            page.title = cls.TITLE
             page.theme = cls.get_theme()
             page.views.clear()
-            self = cls()
+            context = cls.TypeContext(page=page)
+            self = cls(context)
             view = self.view
             if not view:
                 view = self

fmtr/tools/version

@@ -1 +1 @@
-1.3.38
+1.3.40

{fmtr_tools-1.3.38.dist-info → fmtr_tools-1.3.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.38
+Version: 1.3.40
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/fmtr.tools
 Author: Frontmatter
@@ -133,62 +133,62 @@ Requires-Dist: logfire[httpx]; extra == "webhook"
 Provides-Extra: browsers
 Requires-Dist: playwright; extra == "browsers"
 Provides-Extra: all
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: google-auth; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: diskcache; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: faker; extra == "all"
 Requires-Dist: deepmerge; extra == "all"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: diskcache; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: playwright; extra == "all"
-Requires-Dist: html2text; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: docker; extra == "all"
 Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: bokeh; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
 Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: regex; extra == "all"
 Requires-Dist: fastapi; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: ollama; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
 Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: logfire; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: tabulate; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: distributed; extra == "all"
+Requires-Dist: semver; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
+Requires-Dist: playwright; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
 Requires-Dist: setuptools; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: regex; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: peft; extra == "all"
 Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: json_repair; extra == "all"
 Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: faker; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.38.dist-info → fmtr_tools-1.3.40.dist-info}/RECORD

@@ -12,7 +12,7 @@ fmtr/tools/debugging_tools.py,sha256=_xzqS0V5BpL8d06j-jVQjGgI7T020QsqVXKAKMz7Du8
 fmtr/tools/docker_tools.py,sha256=rdaZje2xhlmnfQqZnR7IHgRdWncTLjrJcViUTt5oEwk,617
 fmtr/tools/environment_tools.py,sha256=43uqfj1G1bNX0IwKz-NKbu3AbFYSdbBuGN9rlThe030,1845
 fmtr/tools/function_tools.py,sha256=O1K8HwftXfzrBblNZrj-BhWNbr4poJghrXNr2mFcylI,2831
-fmtr/tools/google_api_tools.py,sha256=owWE0GlnJjmVbXus8ENxT2PH7Fnd3m_r-14xyR7lAnA,1107
+fmtr/tools/google_api_tools.py,sha256=QUungBoj5SCaBQnMjn9QpXtWmdNCplbw8ZPK9LXi77U,1691
 fmtr/tools/hash_tools.py,sha256=tr4HXpeT6rRrDk6TvMlRPUSrLRRaov96y128OI2tzsc,729
 fmtr/tools/hfh_tools.py,sha256=DCDIWuWlhtmIGCtp9cLcOTTEw_4yN_NocLX8w5NZsbk,2384
 fmtr/tools/html_tools.py,sha256=0nN8Nz5HtG9bXyApYfHSKEivLlxjsm3Gn6Mg2TK0brI,394
@@ -45,7 +45,7 @@ fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,1
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=CUhoLtYuOkZkXro_emKCgxROYC4p3ceZxrtbyGlGwQw,6
+fmtr/tools/version,sha256=509ysBiNGW5G48sMKppbTs43JeWeaLLb02lbfZjkc48,6
 fmtr/tools/webhook_tools.py,sha256=q3pVJ1NCem2SrMuFcLxiWd7DibFs7Q-uGtojfXd3Qcg,380
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
@@ -62,9 +62,10 @@ fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGj
 fmtr/tools/entrypoints/install_yamlscript.py,sha256=D9-QET4uPkwMvOBQJAgzn1fYb7Z7VAgZzFdHSAXc3Qc,116
 fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtnsCVEXOdXLIcQWs4,123
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
-fmtr/tools/interface_tools/__init__.py,sha256=nODVT7v657onpmak7qbW4P8NoW2HQqyeEDUSx5pZAFg,331
+fmtr/tools/interface_tools/__init__.py,sha256=hgierRDkJDXrYkPM4z-m44aL7OMS8DKNKJzaXayBmw4,390
+fmtr/tools/interface_tools/context.py,sha256=vTrHwat2s71HCZZySerIlkvhVeeDzyuAWeY4puLVqSY,203
 fmtr/tools/interface_tools/controls.py,sha256=oOl0_sZB8fkvYB-9A5yjArfQmFQLMCsVGgRNrJAFJm4,332
-fmtr/tools/interface_tools/interface_tools.py,sha256=a7WRwf8TKek8ML08ANfkncLfoMHWk5b_929bFf3Y6cQ,3577
+fmtr/tools/interface_tools/interface_tools.py,sha256=y1Lnphbc00kBjP4GyR5YPtMevUS9BR1weex-J3qEw5A,3887
 fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT872Np0,443
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
 fmtr/tools/path_tools/path_tools.py,sha256=eh30PpmH0wopy0wNWuPT84cmXY1EvqsTSDT7AV_GPOY,8034
@@ -81,9 +82,9 @@ fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
 fmtr/tools/version_tools/__init__.py,sha256=pg4iLtmIr5HtyEW_j0fMFoIdzqi_w9xH8-grQaXLB28,318
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.38.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.38.dist-info/METADATA,sha256=fNG_O_TGAtpbSYUjS7nn5eGE150AOSNECmadWbN73Gs,16259
-fmtr_tools-1.3.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.38.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.38.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.38.dist-info/RECORD,,
+fmtr_tools-1.3.40.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.40.dist-info/METADATA,sha256=m6rHbc4NRBpELpK60mCP5SB9qOwm-EolTfaKyKKCMRQ,16259
+fmtr_tools-1.3.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.40.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.40.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.40.dist-info/RECORD,,