fmtr.tools 1.3.38__tar.gz → 1.3.39__tar.gz

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

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

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

@@ -0,0 +1 @@
+1.3.39

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

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

fmtr_tools-1.3.38/fmtr/tools/version

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

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

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