fmtr.tools 1.3.38__tar.gz → 1.3.40__tar.gz

{fmtr_tools-1.3.38 → fmtr_tools-1.3.40}/PKG-INFO

@@ -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: json_repair; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: docker; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: playwright; extra == "all"
 Requires-Dist: pydantic; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: appdirs; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: peft; extra == "all"
 Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: diskcache; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
 Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
 Requires-Dist: semver; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: playwright; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: setuptools; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: regex; extra == "all"
 Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.38 → fmtr_tools-1.3.40}/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-1.3.38 → fmtr_tools-1.3.40}/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-1.3.40/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-1.3.38 → fmtr_tools-1.3.40}/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-1.3.40/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.40

{fmtr_tools-1.3.38 → fmtr_tools-1.3.40}/fmtr.tools.egg-info/PKG-INFO

@@ -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: json_repair; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: docker; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: playwright; extra == "all"
 Requires-Dist: pydantic; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: appdirs; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: peft; extra == "all"
 Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: diskcache; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
 Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
 Requires-Dist: semver; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: playwright; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: setuptools; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: regex; extra == "all"
 Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.38 → fmtr_tools-1.3.40}/fmtr.tools.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ setup.py
 ./fmtr/tools/entrypoints/remote_debug_test.py
 ./fmtr/tools/entrypoints/shell_debug.py
 ./fmtr/tools/interface_tools/__init__.py
+./fmtr/tools/interface_tools/context.py
 ./fmtr/tools/interface_tools/controls.py
 ./fmtr/tools/interface_tools/interface_tools.py
 ./fmtr/tools/path_tools/__init__.py
@@ -156,6 +157,7 @@ fmtr/tools/entrypoints/install_yamlscript.py
 fmtr/tools/entrypoints/remote_debug_test.py
 fmtr/tools/entrypoints/shell_debug.py
 fmtr/tools/interface_tools/__init__.py
+fmtr/tools/interface_tools/context.py
 fmtr/tools/interface_tools/controls.py
 fmtr/tools/interface_tools/interface_tools.py
 fmtr/tools/path_tools/__init__.py

fmtr_tools-1.3.38/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.38

{fmtr_tools-1.3.38 → fmtr_tools-1.3.40}/fmtr.tools.egg-info/requires.txt

@@ -14,62 +14,62 @@ pydantic-ai[logfire,openai]
 ollama
 
 [all]
-json_repair
+sentence_transformers
+google-auth
+flet[all]
+html2text
+ollama
+google-auth-oauthlib
+docker
 pytest-cov
+pandas
+openpyxl
+tokenizers
+peft
+google-api-python-client
+pydantic-ai[logfire,openai]
+transformers[sentencepiece]
+google-auth-httplib2
+Unidecode
+tabulate
+pydevd-pycharm~=251.25410.159
+dnspython[doh]
+pydantic-settings
+fastapi
+json_repair
+pymupdf4llm
+pymupdf
+logfire[httpx]
+flet-video
+httpx_retries
+deepmerge
+logfire
+distributed
+playwright
 pydantic
+uvicorn[standard]
+cachetools
+pyyaml
+bokeh
+openai
+tinynetrc
+huggingface_hub
 appdirs
-httpx
-contexttimer
-peft
 flet-webview
+yamlscript
 diskcache
-google-auth
-cachetools
-google-api-python-client
-uvicorn[standard]
-pandas
-pydantic-settings
 sre_yield
-tokenizers
-dask[bag]
 semver
 faker
-torchvision
-google-auth-oauthlib
-openpyxl
-playwright
-google-auth-httplib2
+contexttimer
 setuptools
-yamlscript
-regex
-html2text
-pydevd-pycharm~=251.25410.159
+torchvision
 logfire[fastapi]
-pyyaml
-huggingface_hub
-filetype
-deepmerge
-transformers[sentencepiece]
-bokeh
-Unidecode
-fastapi
-tinynetrc
-flet[all]
-pymupdf4llm
-distributed
-openai
-tabulate
-dnspython[doh]
+regex
 torchaudio
-flet-video
-ollama
-httpx_retries
-logfire[httpx]
-pymupdf
-docker
-sentence_transformers
-logfire
-pydantic-ai[logfire,openai]
+dask[bag]
+httpx
+filetype
 
 [api]
 fastapi