diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 111d0e9..53d8e53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,20 +21,19 @@ on: jobs: build: strategy: - fail-fast: false matrix: platform: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] exclude: [ # windows runners are pretty scarce, so let's only run lowest and highest python version + {platform: windows-latest, python-version: '3.9' }, {platform: windows-latest, python-version: '3.10'}, {platform: windows-latest, python-version: '3.11'}, - {platform: windows-latest, python-version: '3.12'}, # same, macos is a bit too slow and ubuntu covers python quirks well + {platform: macos-latest , python-version: '3.9' }, {platform: macos-latest , python-version: '3.10' }, {platform: macos-latest , python-version: '3.11' }, - {platform: macos-latest , python-version: '3.12' }, ] runs-on: ${{ matrix.platform }} @@ -64,13 +63,11 @@ jobs: - if: matrix.platform == 'ubuntu-latest' # no need to compute coverage for other platforms uses: actions/upload-artifact@v4 with: - include-hidden-files: true name: .coverage.mypy-misc_${{ matrix.platform }}_${{ matrix.python-version }} path: .coverage.mypy-misc/ - if: matrix.platform == 'ubuntu-latest' # no need to compute coverage for other platforms uses: actions/upload-artifact@v4 with: - include-hidden-files: true name: .coverage.mypy-core_${{ matrix.platform }}_${{ matrix.python-version }} path: .coverage.mypy-core/ @@ -84,7 +81,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.8' - uses: actions/checkout@v4 with: diff --git a/.gitignore b/.gitignore index 65ba630..19c3380 100644 --- a/.gitignore +++ b/.gitignore @@ -155,9 +155,6 @@ celerybeat-schedule .dmypy.json dmypy.json -# linters -.ruff_cache/ - # Pyre type checker .pyre/ diff --git a/CHANGELOG.md b/CHANGELOG.md index d60ef35..3dd19df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ General/my.core changes: - e81dddddf083ffd81aa7e2b715bd34f59949479c properly resolve class properties in make_config + add test Modules: -- some initial work on filling **InfluxDB** with HPI data +- some innitial work on filling **InfluxDB** with HPI data - pinboard - 42399f6250d9901d93dcedcfe05f7857babcf834: **breaking backwards compatibility**, use pinbexport module directly diff --git a/README.org b/README.org index 79621a5..c065a0c 100644 --- a/README.org +++ b/README.org @@ -723,10 +723,10 @@ If you want to write modules for personal use but don't want to merge them into Other HPI Repositories: -- [[https://github.com/purarue/HPI][purarue/HPI]] +- [[https://github.com/seanbreckenridge/HPI][seanbreckenridge/HPI]] - [[https://github.com/madelinecameron/hpi][madelinecameron/HPI]] -If you want to create your own to create your own modules/override something here, you can use the [[https://github.com/purarue/HPI-template][template]]. +If you want to create your own to create your own modules/override something here, you can use the [[https://github.com/seanbreckenridge/HPI-template][template]]. * Related links :PROPERTIES: diff --git a/doc/DENYLIST.md b/doc/DENYLIST.md index 3d8dea0..440715c 100644 --- a/doc/DENYLIST.md +++ b/doc/DENYLIST.md @@ -76,7 +76,7 @@ This would typically be used in an overridden `all.py` file, or in a one-off scr which you may want to filter out some items from a source, progressively adding more items to the denylist as you go. -A potential `my/ip/all.py` file might look like (Sidenote: `discord` module from [here](https://github.com/purarue/HPI)): +A potential `my/ip/all.py` file might look like (Sidenote: `discord` module from [here](https://github.com/seanbreckenridge/HPI)): ```python from typing import Iterator @@ -119,9 +119,9 @@ python3 -c 'from my.ip import all; all.deny.deny_cli(all.ips())' To edit the `all.py`, you could either: - install it as editable (`python3 -m pip install --user -e ./HPI`), and then edit the file directly -- or, create a namespace package, which splits the package across multiple directories. For info on that see [`MODULE_DESIGN`](https://github.com/karlicoss/HPI/blob/master/doc/MODULE_DESIGN.org#namespace-packages), [`reorder_editable`](https://github.com/purarue/reorder_editable), and possibly the [`HPI-template`](https://github.com/purarue/HPI-template) to create your own HPI namespace package to create your own `all.py` file. +- or, create a namespace package, which splits the package across multiple directories. For info on that see [`MODULE_DESIGN`](https://github.com/karlicoss/HPI/blob/master/doc/MODULE_DESIGN.org#namespace-packages), [`reorder_editable`](https://github.com/seanbreckenridge/reorder_editable), and possibly the [`HPI-template`](https://github.com/seanbreckenridge/HPI-template) to create your own HPI namespace package to create your own `all.py` file. -For a real example of this see, [purarue/HPI-personal](https://github.com/purarue/HPI-personal/blob/master/my/ip/all.py) +For a real example of this see, [seanbreckenridge/HPI-personal](https://github.com/seanbreckenridge/HPI-personal/blob/master/my/ip/all.py) Sidenote: the reason why we want to specifically override the all.py and not just create a script that filters out the items you're diff --git a/doc/MODULES.org b/doc/MODULES.org index 347d88d..9f48024 100644 --- a/doc/MODULES.org +++ b/doc/MODULES.org @@ -76,7 +76,7 @@ The config snippets below are meant to be modified accordingly and *pasted into You don't have to set up all modules at once, it's recommended to do it gradually, to get the feel of how HPI works. -For an extensive/complex example, you can check out ~@purarue~'s [[https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py][config]] +For an extensive/complex example, you can check out ~@seanbreckenridge~'s [[https://github.com/seanbreckenridge/dotfiles/blob/master/.config/my/my/config/__init__.py][config]] # Nested Configurations before the doc generation using the block below ** [[file:../my/reddit][my.reddit]] @@ -96,7 +96,7 @@ For an extensive/complex example, you can check out ~@purarue~'s [[https://githu class pushshift: ''' - Uses [[https://github.com/purarue/pushshift_comment_export][pushshift]] to get access to old comments + Uses [[https://github.com/seanbreckenridge/pushshift_comment_export][pushshift]] to get access to old comments ''' # path[s]/glob to the exported JSON data @@ -106,7 +106,7 @@ For an extensive/complex example, you can check out ~@purarue~'s [[https://githu ** [[file:../my/browser/][my.browser]] - Parses browser history using [[http://github.com/purarue/browserexport][browserexport]] + Parses browser history using [[http://github.com/seanbreckenridge/browserexport][browserexport]] #+begin_src python class browser: @@ -132,7 +132,7 @@ For an extensive/complex example, you can check out ~@purarue~'s [[https://githu You might also be able to use [[file:../my/location/via_ip.py][my.location.via_ip]] which uses =my.ip.all= to provide geolocation data for an IPs (though no IPs are provided from any - of the sources here). For an example of usage, see [[https://github.com/purarue/HPI/tree/master/my/ip][here]] + of the sources here). For an example of usage, see [[https://github.com/seanbreckenridge/HPI/tree/master/my/ip][here]] #+begin_src python class location: @@ -256,9 +256,9 @@ for cls, p in modules: ** [[file:../my/google/takeout/parser.py][my.google.takeout.parser]] - Parses Google Takeout using [[https://github.com/purarue/google_takeout_parser][google_takeout_parser]] + Parses Google Takeout using [[https://github.com/seanbreckenridge/google_takeout_parser][google_takeout_parser]] - See [[https://github.com/purarue/google_takeout_parser][google_takeout_parser]] for more information about how to export and organize your takeouts + See [[https://github.com/seanbreckenridge/google_takeout_parser][google_takeout_parser]] for more information about how to export and organize your takeouts If the =DISABLE_TAKEOUT_CACHE= environment variable is set, this won't cache individual exports in =~/.cache/google_takeout_parser= diff --git a/doc/MODULE_DESIGN.org b/doc/MODULE_DESIGN.org index 442dbf2..7aedf2f 100644 --- a/doc/MODULE_DESIGN.org +++ b/doc/MODULE_DESIGN.org @@ -67,7 +67,7 @@ If you want to disable a source, you have a few options. ... that suppresses the warning message and lets you use ~my.location.all~ without having to change any lines of code -Another benefit is that all the custom sources/data is localized to the ~all.py~ file, so a user can override the ~all.py~ (see the sections below on ~namespace packages~) file in their own HPI repository, adding additional sources without having to maintain a fork and patching in changes as things eventually change. For a 'real world' example of that, see [[https://github.com/purarue/HPI#partially-in-usewith-overrides][purarue]]s location and ip modules. +Another benefit is that all the custom sources/data is localized to the ~all.py~ file, so a user can override the ~all.py~ (see the sections below on ~namespace packages~) file in their own HPI repository, adding additional sources without having to maintain a fork and patching in changes as things eventually change. For a 'real world' example of that, see [[https://github.com/seanbreckenridge/HPI#partially-in-usewith-overrides][seanbreckenridge]]s location and ip modules. This is of course not required for personal or single file modules, its just the pattern that seems to have the least amount of friction for the user, while being extendable, and without using a bulky plugin system to let users add additional sources. @@ -208,13 +208,13 @@ Where ~lastfm.py~ is your version of ~my.lastfm~, which you've copied from this Then, running ~python3 -m pip install -e .~ in that directory would install that as part of the namespace package, and assuming (see below for possible issues) this appears on ~sys.path~ before the upstream repository, your ~lastfm.py~ file overrides the upstream. Adding more files, like ~my.some_new_module~ into that directory immediately updates the global ~my~ package -- allowing you to quickly add new modules without having to re-install. -If you install both directories as editable packages (which has the benefit of any changes you making in either repository immediately updating the globally installed ~my~ package), there are some concerns with which editable install appears on your ~sys.path~ first. If you wanted your modules to override the upstream modules, yours would have to appear on the ~sys.path~ first (this is the same reason that =custom_lastfm_overlay= must be at the front of your ~PYTHONPATH~). For more details and examples on dealing with editable namespace packages in the context of HPI, see the [[https://github.com/purarue/reorder_editable][reorder_editable]] repository. +If you install both directories as editable packages (which has the benefit of any changes you making in either repository immediately updating the globally installed ~my~ package), there are some concerns with which editable install appears on your ~sys.path~ first. If you wanted your modules to override the upstream modules, yours would have to appear on the ~sys.path~ first (this is the same reason that =custom_lastfm_overlay= must be at the front of your ~PYTHONPATH~). For more details and examples on dealing with editable namespace packages in the context of HPI, see the [[https://github.com/seanbreckenridge/reorder_editable][reorder_editable]] repository. There is no limit to how many directories you could install into a single namespace package, which could be a possible way for people to install additional HPI modules, without worrying about the module count here becoming too large to manage. -There are some other users [[https://github.com/hpi/hpi][who have begun publishing their own modules]] as namespace packages, which you could potentially install and use, in addition to this repository, if any of those interest you. If you want to create your own you can use the [[https://github.com/purarue/HPI-template][template]] to get started. +There are some other users [[https://github.com/hpi/hpi][who have begun publishing their own modules]] as namespace packages, which you could potentially install and use, in addition to this repository, if any of those interest you. If you want to create your own you can use the [[https://github.com/seanbreckenridge/HPI-template][template]] to get started. -Though, enabling this many modules may make ~hpi doctor~ look pretty busy. You can explicitly choose to enable/disable modules with a list of modules/regexes in your [[https://github.com/karlicoss/HPI/blob/f559e7cb899107538e6c6bbcf7576780604697ef/my/core/core_config.py#L24-L55][core config]], see [[https://github.com/purarue/dotfiles/blob/a1a77c581de31bd55a6af3d11b8af588614a207e/.config/my/my/config/__init__.py#L42-L72][here]] for an example. +Though, enabling this many modules may make ~hpi doctor~ look pretty busy. You can explicitly choose to enable/disable modules with a list of modules/regexes in your [[https://github.com/karlicoss/HPI/blob/f559e7cb899107538e6c6bbcf7576780604697ef/my/core/core_config.py#L24-L55][core config]], see [[https://github.com/seanbreckenridge/dotfiles/blob/a1a77c581de31bd55a6af3d11b8af588614a207e/.config/my/my/config/__init__.py#L42-L72][here]] for an example. You may use the other modules or [[https://github.com/karlicoss/hpi-personal-overlay][my overlay]] as reference, but python packaging is already a complicated issue, before adding complexities like namespace packages and editable installs on top of it... If you're having trouble extending HPI in this fashion, you can open an issue here, preferably with a link to your code/repository and/or ~setup.py~ you're trying to use. diff --git a/doc/OVERLAYS.org b/doc/OVERLAYS.org index 7bafa48..1e6cf8f 100644 --- a/doc/OVERLAYS.org +++ b/doc/OVERLAYS.org @@ -10,7 +10,7 @@ Relevant discussion about overlays: https://github.com/karlicoss/HPI/issues/102 # You can see them TODO in overlays dir -Consider a toy package/module structure with minimal code, without any actual data parsing, just for demonstration purposes. +Consider a toy package/module structure with minimal code, wihout any actual data parsing, just for demonstration purposes. - =main= package structure # TODO do links @@ -19,7 +19,7 @@ Consider a toy package/module structure with minimal code, without any actual da Extracts Twitter data from GDPR archive. - =my/twitter/all.py= Merges twitter data from multiple sources (only =gdpr= in this case), so data consumers are agnostic of specific data sources used. - This will be overridden by =overlay=. + This will be overriden by =overlay=. - =my/twitter/common.py= Contains helper function to merge data, so they can be reused by overlay's =all.py=. - =my/reddit.py= @@ -66,7 +66,7 @@ This basically means that modules will be searched in both paths, with overlay t ** Installing with =--use-pep517= -See here for discussion https://github.com/purarue/reorder_editable/issues/2, but TLDR it should work similarly. +See here for discussion https://github.com/seanbreckenridge/reorder_editable/issues/2, but TLDR it should work similarly. * Testing runtime behaviour (editable install) @@ -126,7 +126,7 @@ https://github.com/python/mypy/blob/1dd8e7fe654991b01bd80ef7f1f675d9e3910c3a/myp For now, I opened an issue in mypy repository https://github.com/python/mypy/issues/16683 -But ok, maybe mypy treats =main= as an external package somehow but still type checks it properly? +But ok, maybe mypy treats =main= as an external package somhow but still type checks it properly? Let's see what's going on with imports: : $ mypy --namespace-packages --strict -p my --follow-imports=error diff --git a/doc/QUERY.md b/doc/QUERY.md index 9a5d9d3..b672dff 100644 --- a/doc/QUERY.md +++ b/doc/QUERY.md @@ -97,9 +97,9 @@ By default, this just returns the items in the order they were returned by the f hpi query my.coding.commits.commits --order-key committed_dt --limit 1 --reverse --output pprint --stream Commit(committed_dt=datetime.datetime(2023, 4, 14, 23, 9, 1, tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=61200))), authored_dt=datetime.datetime(2023, 4, 14, 23, 4, 1, tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=61200))), - message='sources.smscalls: propagate errors if there are breaking ' + message='sources.smscalls: propogate errors if there are breaking ' 'schema changes', - repo='/home/username/Repos/promnesia-fork', + repo='/home/sean/Repos/promnesia-fork', sha='22a434fca9a28df9b0915ccf16368df129d2c9ce', ref='refs/heads/smscalls-handle-result') ``` @@ -195,7 +195,7 @@ To preview, you can use something like [`qgis`](https://qgis.org/en/site/) or fo chicago trip -(Sidenote: this is [`@purarue`](https://github.com/purarue/)s locations, on a trip to Chicago) +(Sidenote: this is [`@seanbreckenridge`](https://github.com/seanbreckenridge/)s locations, on a trip to Chicago) ## Python reference @@ -301,4 +301,4 @@ The `hpi query` command is a CLI wrapper around the code in [`query.py`](../my/c If you specify a range, drop_unsorted is forced to be True ``` -Those can be imported and accept any sort of iterator, `hpi query` just defaults to the output of functions here. As an example, see [`listens`](https://github.com/purarue/HPI-personal/blob/master/scripts/listens) which just passes an generator (iterator) as the first argument to `query_range` +Those can be imported and accept any sort of iterator, `hpi query` just defaults to the output of functions here. As an example, see [`listens`](https://github.com/seanbreckenridge/HPI-personal/blob/master/scripts/listens) which just passes an generator (iterator) as the first argument to `query_range` diff --git a/doc/SETUP.org b/doc/SETUP.org index ee9571c..0fced62 100644 --- a/doc/SETUP.org +++ b/doc/SETUP.org @@ -387,7 +387,7 @@ But there is an extra caveat: rexport is already coming with nice [[https://gith Several other HPI modules are following a similar pattern: hypothesis, instapaper, pinboard, kobo, etc. -Since the [[https://github.com/karlicoss/rexport#api-limitations][reddit API has limited results]], you can use [[https://github.com/purarue/pushshift_comment_export][my.reddit.pushshift]] to access older reddit comments, which both then get merged into =my.reddit.all.comments= +Since the [[https://github.com/karlicoss/rexport#api-limitations][reddit API has limited results]], you can use [[https://github.com/seanbreckenridge/pushshift_comment_export][my.reddit.pushshift]] to access older reddit comments, which both then get merged into =my.reddit.all.comments= ** Twitter diff --git a/misc/.flake8-karlicoss b/misc/.flake8-karlicoss index 5933253..3c98b96 100644 --- a/misc/.flake8-karlicoss +++ b/misc/.flake8-karlicoss @@ -32,6 +32,6 @@ ignore = # # as a reference: -# https://github.com/purarue/cookiecutter-template/blob/master/%7B%7Bcookiecutter.module_name%7D%7D/setup.cfg +# https://github.com/seanbreckenridge/cookiecutter-template/blob/master/%7B%7Bcookiecutter.module_name%7D%7D/setup.cfg # and this https://github.com/karlicoss/HPI/pull/151 # find ./my | entr flake8 --ignore=E402,E501,E741,W503,E266,E302,E305,E203,E261,E252,E251,E221,W291,E225,E303,E702,E202,F841,E731,E306,E127 E722,E231 my | grep -v __NOT_HPI_MODULE__ diff --git a/my/arbtt.py b/my/arbtt.py index 5d4bf8e..2bcf291 100644 --- a/my/arbtt.py +++ b/my/arbtt.py @@ -2,22 +2,20 @@ [[https://github.com/nomeata/arbtt#arbtt-the-automatic-rule-based-time-tracker][Arbtt]] time tracking ''' -from __future__ import annotations - REQUIRES = ['ijson', 'cffi'] # NOTE likely also needs libyajl2 from apt or elsewhere? -from collections.abc import Iterable, Sequence from dataclasses import dataclass from pathlib import Path +from typing import Sequence, Iterable, List, Optional def inputs() -> Sequence[Path]: try: from my.config import arbtt as user_config except ImportError: - from my.core.warnings import low + from .core.warnings import low low("Couldn't find 'arbtt' config section, falling back to the default capture.log (usually in HOME dir). Add 'arbtt' section with logfiles = '' to suppress this warning.") return [] else: @@ -57,7 +55,7 @@ class Entry: return fromisoformat(ds) @property - def active(self) -> str | None: + def active(self) -> Optional[str]: # NOTE: WIP, might change this in the future... ait = (w for w in self.json['windows'] if w['active']) a = next(ait, None) @@ -76,18 +74,17 @@ class Entry: def entries() -> Iterable[Entry]: inps = list(inputs()) - base: list[PathIsh] = ['arbtt-dump', '--format=json'] + base: List[PathIsh] = ['arbtt-dump', '--format=json'] - cmds: list[list[PathIsh]] + cmds: List[List[PathIsh]] if len(inps) == 0: cmds = [base] # rely on default else: # otherwise, 'merge' them cmds = [[*base, '--logfile', f] for f in inps] - from subprocess import PIPE, Popen - - import ijson.backends.yajl2_cffi as ijson # type: ignore + import ijson.backends.yajl2_cffi as ijson # type: ignore + from subprocess import Popen, PIPE for cmd in cmds: with Popen(cmd, stdout=PIPE) as p: out = p.stdout; assert out is not None @@ -96,8 +93,8 @@ def entries() -> Iterable[Entry]: def fill_influxdb() -> None: - from .core.freezer import Freezer from .core.influxdb import magic_fill + from .core.freezer import Freezer freezer = Freezer(Entry) fit = (freezer.freeze(e) for e in entries()) # TODO crap, influxdb doesn't like None https://github.com/influxdata/influxdb/issues/7722 @@ -109,8 +106,6 @@ def fill_influxdb() -> None: magic_fill(fit, name=f'{entries.__module__}:{entries.__name__}') -from .core import Stats, stat - - +from .core import stat, Stats def stats() -> Stats: return stat(entries) diff --git a/my/bluemaestro.py b/my/bluemaestro.py index 8c739f0..4c33fd1 100644 --- a/my/bluemaestro.py +++ b/my/bluemaestro.py @@ -2,17 +2,14 @@ [[https://bluemaestro.com/products/product-details/bluetooth-environmental-monitor-and-logger][Bluemaestro]] temperature/humidity/pressure monitor """ -from __future__ import annotations - # todo most of it belongs to DAL... but considering so few people use it I didn't bother for now import re import sqlite3 from abc import abstractmethod -from collections.abc import Iterable, Sequence from dataclasses import dataclass from datetime import datetime, timedelta from pathlib import Path -from typing import Protocol +from typing import Iterable, Optional, Protocol, Sequence, Set import pytz @@ -90,17 +87,17 @@ def measurements() -> Iterable[Res[Measurement]]: total = len(paths) width = len(str(total)) - last: datetime | None = None + last: Optional[datetime] = None # tables are immutable, so can save on processing.. - processed_tables: set[str] = set() + processed_tables: Set[str] = set() for idx, path in enumerate(paths): logger.info(f'processing [{idx:>{width}}/{total:>{width}}] {path}') tot = 0 new = 0 # todo assert increasing timestamp? with sqlite_connect_immutable(path) as db: - db_dt: datetime | None = None + db_dt: Optional[datetime] = None try: datas = db.execute( f'SELECT "{path.name}" as name, Time, Temperature, Humidity, Pressure, Dewpoint FROM data ORDER BY log_index' diff --git a/my/body/blood.py b/my/body/blood.py index 867568c..fb035eb 100644 --- a/my/body/blood.py +++ b/my/body/blood.py @@ -2,42 +2,41 @@ Blood tracking (manual org-mode entries) """ -from __future__ import annotations - -from collections.abc import Iterable from datetime import datetime -from typing import NamedTuple - -import orgparse -import pandas as pd - -from my.config import blood as config # type: ignore[attr-defined] +from typing import Iterable, NamedTuple, Optional from ..core.error import Res -from ..core.orgmode import one_table, parse_org_datetime +from ..core.orgmode import parse_org_datetime, one_table + + +import pandas as pd +import orgparse + + +from my.config import blood as config # type: ignore[attr-defined] class Entry(NamedTuple): dt: datetime - ketones : float | None=None - glucose : float | None=None + ketones : Optional[float]=None + glucose : Optional[float]=None - vitamin_d : float | None=None - vitamin_b12 : float | None=None + vitamin_d : Optional[float]=None + vitamin_b12 : Optional[float]=None - hdl : float | None=None - ldl : float | None=None - triglycerides: float | None=None + hdl : Optional[float]=None + ldl : Optional[float]=None + triglycerides: Optional[float]=None - source : str | None=None - extra : str | None=None + source : Optional[str]=None + extra : Optional[str]=None Result = Res[Entry] -def try_float(s: str) -> float | None: +def try_float(s: str) -> Optional[float]: l = s.split() if len(l) == 0: return None @@ -106,7 +105,6 @@ def blood_tests_data() -> Iterable[Result]: def data() -> Iterable[Result]: from itertools import chain - from ..core.error import sort_res_by datas = chain(glucose_ketones_data(), blood_tests_data()) return sort_res_by(datas, key=lambda e: e.dt) diff --git a/my/body/exercise/all.py b/my/body/exercise/all.py index d0df747..e86a5af 100644 --- a/my/body/exercise/all.py +++ b/my/body/exercise/all.py @@ -7,10 +7,10 @@ from ...core.pandas import DataFrameT, check_dataframe @check_dataframe def dataframe() -> DataFrameT: # this should be somehow more flexible... - import pandas as pd - from ...endomondo import dataframe as EDF - from ...runnerup import dataframe as RDF + from ...runnerup import dataframe as RDF + + import pandas as pd return pd.concat([ EDF(), RDF(), diff --git a/my/body/exercise/cardio.py b/my/body/exercise/cardio.py index d8a6afd..083b972 100644 --- a/my/body/exercise/cardio.py +++ b/my/body/exercise/cardio.py @@ -3,6 +3,7 @@ Cardio data, filtered from various data sources ''' from ...core.pandas import DataFrameT, check_dataframe + CARDIO = { 'Running', 'Running, treadmill', diff --git a/my/body/exercise/cross_trainer.py b/my/body/exercise/cross_trainer.py index 30f96f9..edbb557 100644 --- a/my/body/exercise/cross_trainer.py +++ b/my/body/exercise/cross_trainer.py @@ -5,18 +5,16 @@ This is probably too specific to my needs, so later I will move it away to a per For now it's worth keeping it here as an example and perhaps utility functions might be useful for other HPI modules. ''' -from __future__ import annotations - from datetime import datetime, timedelta +from typing import Optional -import pytz +from ...core.pandas import DataFrameT, check_dataframe as cdf +from ...core.orgmode import collect, Table, parse_org_datetime, TypedTable from my.config import exercise as config -from ...core.orgmode import Table, TypedTable, collect, parse_org_datetime -from ...core.pandas import DataFrameT -from ...core.pandas import check_dataframe as cdf +import pytz # FIXME how to attach it properly? tz = pytz.timezone('Europe/London') @@ -116,7 +114,7 @@ def dataframe() -> DataFrameT: rows.append(rd) # presumably has an error set continue - idx: int | None + idx: Optional[int] close = edf[edf['start_time'].apply(lambda t: pd_date_diff(t, mdate)).abs() < _DELTA] if len(close) == 0: idx = None @@ -165,9 +163,7 @@ def dataframe() -> DataFrameT: # TODO wtf?? where is speed coming from?? -from ...core import Stats, stat - - +from ...core import stat, Stats def stats() -> Stats: return stat(cross_trainer_data) diff --git a/my/body/sleep/common.py b/my/body/sleep/common.py index fc288e5..1100814 100644 --- a/my/body/sleep/common.py +++ b/my/body/sleep/common.py @@ -1,6 +1,5 @@ -from ...core import Stats, stat -from ...core.pandas import DataFrameT -from ...core.pandas import check_dataframe as cdf +from ...core import stat, Stats +from ...core.pandas import DataFrameT, check_dataframe as cdf class Combine: diff --git a/my/body/sleep/main.py b/my/body/sleep/main.py index 2460e03..29b12a7 100644 --- a/my/body/sleep/main.py +++ b/my/body/sleep/main.py @@ -1,6 +1,7 @@ -from ... import emfit, jawbone -from .common import Combine +from ... import jawbone +from ... import emfit +from .common import Combine _combined = Combine([ jawbone, emfit, diff --git a/my/body/weight.py b/my/body/weight.py index d5478ef..51e6513 100644 --- a/my/body/weight.py +++ b/my/body/weight.py @@ -2,15 +2,15 @@ Weight data (manually logged) ''' -from collections.abc import Iterator from dataclasses import dataclass from datetime import datetime -from typing import Any +from typing import Any, Iterator -from my import orgmode from my.core import make_logger from my.core.error import Res, extract_error_datetime, set_error_datetime +from my import orgmode + config = Any diff --git a/my/books/kobo.py b/my/books/kobo.py index 40b7ed7..2a469d0 100644 --- a/my/books/kobo.py +++ b/my/books/kobo.py @@ -1,6 +1,7 @@ -from my.core import warnings +from ..core import warnings warnings.high('my.books.kobo is deprecated! Please use my.kobo instead!') -from my.core.util import __NOT_HPI_MODULE__ -from my.kobo import * +from ..core.util import __NOT_HPI_MODULE__ + +from ..kobo import * # type: ignore[no-redef] diff --git a/my/browser/active_browser.py b/my/browser/active_browser.py index 1686fc5..6f335bd 100644 --- a/my/browser/active_browser.py +++ b/my/browser/active_browser.py @@ -1,5 +1,5 @@ """ -Parses active browser history by backing it up with [[http://github.com/purarue/sqlite_backup][sqlite_backup]] +Parses active browser history by backing it up with [[http://github.com/seanbreckenridge/sqlite_backup][sqlite_backup]] """ REQUIRES = ["browserexport", "sqlite_backup"] @@ -19,18 +19,16 @@ class config(user_config.active_browser): export_path: Paths -from collections.abc import Iterator, Sequence from pathlib import Path +from typing import Sequence, Iterator -from browserexport.merge import Visit, read_visits +from my.core import get_files, Stats, make_logger +from browserexport.merge import read_visits, Visit from sqlite_backup import sqlite_backup -from my.core import Stats, get_files, make_logger - logger = make_logger(__name__) from .common import _patch_browserexport_logs - _patch_browserexport_logs(logger.level) diff --git a/my/browser/all.py b/my/browser/all.py index feb973a..a7d12b4 100644 --- a/my/browser/all.py +++ b/my/browser/all.py @@ -1,9 +1,9 @@ -from collections.abc import Iterator - -from browserexport.merge import Visit, merge_visits +from typing import Iterator from my.core import Stats from my.core.source import import_source +from browserexport.merge import merge_visits, Visit + src_export = import_source(module_name="my.browser.export") src_active = import_source(module_name="my.browser.active_browser") diff --git a/my/browser/export.py b/my/browser/export.py index 52ade0e..1b428b5 100644 --- a/my/browser/export.py +++ b/my/browser/export.py @@ -1,15 +1,14 @@ """ -Parses browser history using [[http://github.com/purarue/browserexport][browserexport]] +Parses browser history using [[http://github.com/seanbreckenridge/browserexport][browserexport]] """ REQUIRES = ["browserexport"] -from collections.abc import Iterator, Sequence from dataclasses import dataclass from pathlib import Path +from typing import Iterator, Sequence -from browserexport.merge import Visit, read_and_merge - +import my.config from my.core import ( Paths, Stats, @@ -19,9 +18,9 @@ from my.core import ( ) from my.core.cachew import mcachew -from .common import _patch_browserexport_logs +from browserexport.merge import read_and_merge, Visit -import my.config # isort: skip +from .common import _patch_browserexport_logs @dataclass diff --git a/my/bumble/android.py b/my/bumble/android.py index 3f9fa13..54a0441 100644 --- a/my/bumble/android.py +++ b/my/bumble/android.py @@ -3,24 +3,24 @@ Bumble data from Android app database (in =/data/data/com.bumble.app/databases/C """ from __future__ import annotations -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime -from pathlib import Path +from typing import Iterator, Sequence, Optional, Dict from more_itertools import unique_everseen -from my.core import Paths, get_files - -from my.config import bumble as user_config # isort: skip +from my.config import bumble as user_config +from ..core import Paths @dataclass class config(user_config.android): # paths[s]/glob to the exported sqlite databases export_path: Paths +from ..core import get_files +from pathlib import Path def inputs() -> Sequence[Path]: return get_files(config.export_path) @@ -43,23 +43,21 @@ class _BaseMessage: @dataclass(unsafe_hash=True) class _Message(_BaseMessage): conversation_id: str - reply_to_id: str | None + reply_to_id: Optional[str] @dataclass(unsafe_hash=True) class Message(_BaseMessage): person: Person - reply_to: Message | None + reply_to: Optional[Message] import json -import sqlite3 from typing import Union - -from my.core.compat import assert_never - from ..core import Res -from ..core.sqlite import select, sqlite_connect_immutable +import sqlite3 +from ..core.sqlite import sqlite_connect_immutable, select +from my.core.compat import assert_never EntitiesRes = Res[Union[Person, _Message]] @@ -122,8 +120,8 @@ _UNKNOWN_PERSON = "UNKNOWN_PERSON" def messages() -> Iterator[Res[Message]]: - id2person: dict[str, Person] = {} - id2msg: dict[str, Message] = {} + id2person: Dict[str, Person] = {} + id2msg: Dict[str, Message] = {} for x in unique_everseen(_entities(), key=_key): if isinstance(x, Exception): yield x diff --git a/my/calendar/holidays.py b/my/calendar/holidays.py index 522672e..af51696 100644 --- a/my/calendar/holidays.py +++ b/my/calendar/holidays.py @@ -15,8 +15,7 @@ from my.core.time import zone_to_countrycode @lru_cache(1) def _calendar(): - from workalendar.registry import registry # type: ignore - + from workalendar.registry import registry # type: ignore # todo switch to using time.tz.main once _get_tz stabilizes? from ..time.tz import via_location as LTZ # TODO would be nice to do it dynamically depending on the past timezones... diff --git a/my/cfg.py b/my/cfg.py index 9331e8a..e4020b4 100644 --- a/my/cfg.py +++ b/my/cfg.py @@ -1,6 +1,7 @@ import my.config as config from .core import __NOT_HPI_MODULE__ + from .core import warnings as W # still used in Promnesia, maybe in dashboard? diff --git a/my/codeforces.py b/my/codeforces.py index 9c6b7c9..f2d150a 100644 --- a/my/codeforces.py +++ b/my/codeforces.py @@ -1,12 +1,13 @@ -import json -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from functools import cached_property +import json from pathlib import Path +from typing import Dict, Iterator, Sequence + +from my.core import get_files, Res, datetime_aware from my.config import codeforces as config # type: ignore[attr-defined] -from my.core import Res, datetime_aware, get_files def inputs() -> Sequence[Path]: @@ -38,7 +39,7 @@ class Competition: class Parser: def __init__(self, *, inputs: Sequence[Path]) -> None: self.inputs = inputs - self.contests: dict[ContestId, Contest] = {} + self.contests: Dict[ContestId, Contest] = {} def _parse_allcontests(self, p: Path) -> Iterator[Contest]: j = json.loads(p.read_text()) diff --git a/my/coding/commits.py b/my/coding/commits.py index fe17dee..31c366e 100644 --- a/my/coding/commits.py +++ b/my/coding/commits.py @@ -1,32 +1,29 @@ """ Git commits data for repositories on your filesystem """ - -from __future__ import annotations - REQUIRES = [ 'gitpython', ] -import shutil -from collections.abc import Iterator, Sequence -from dataclasses import dataclass, field -from datetime import datetime, timezone -from pathlib import Path -from typing import Optional, cast -from my.core import LazyLogger, PathIsh, make_config +import shutil +from pathlib import Path +from datetime import datetime, timezone +from dataclasses import dataclass, field +from typing import List, Optional, Iterator, Set, Sequence, cast + + +from my.core import PathIsh, LazyLogger, make_config from my.core.cachew import cache_dir, mcachew from my.core.warnings import high -from my.config import commits as user_config # isort: skip - +from my.config import commits as user_config @dataclass class commits_cfg(user_config): roots: Sequence[PathIsh] = field(default_factory=list) - emails: Sequence[str] | None = None - names: Sequence[str] | None = None + emails: Optional[Sequence[str]] = None + names: Optional[Sequence[str]] = None # experiment to make it lazy? @@ -43,6 +40,7 @@ def config() -> commits_cfg: import git from git.repo.fun import is_git_dir + log = LazyLogger(__name__, level='info') @@ -95,7 +93,7 @@ def _git_root(git_dir: PathIsh) -> Path: return gd # must be bare -def _repo_commits_aux(gr: git.Repo, rev: str, emitted: set[str]) -> Iterator[Commit]: +def _repo_commits_aux(gr: git.Repo, rev: str, emitted: Set[str]) -> Iterator[Commit]: # without path might not handle pull heads properly for c in gr.iter_commits(rev=rev): if not by_me(c): @@ -122,7 +120,7 @@ def _repo_commits_aux(gr: git.Repo, rev: str, emitted: set[str]) -> Iterator[Com def repo_commits(repo: PathIsh): gr = git.Repo(str(repo)) - emitted: set[str] = set() + emitted: Set[str] = set() for r in gr.references: yield from _repo_commits_aux(gr=gr, rev=r.path, emitted=emitted) @@ -143,14 +141,14 @@ def canonical_name(repo: Path) -> str: def _fd_path() -> str: # todo move it to core - fd_path: str | None = shutil.which("fdfind") or shutil.which("fd-find") or shutil.which("fd") + fd_path: Optional[str] = shutil.which("fdfind") or shutil.which("fd-find") or shutil.which("fd") if fd_path is None: high("my.coding.commits requires 'fd' to be installed, See https://github.com/sharkdp/fd#installation") assert fd_path is not None return fd_path -def git_repos_in(roots: list[Path]) -> list[Path]: +def git_repos_in(roots: List[Path]) -> List[Path]: from subprocess import check_output outputs = check_output([ _fd_path(), @@ -174,7 +172,7 @@ def git_repos_in(roots: list[Path]) -> list[Path]: return repos -def repos() -> list[Path]: +def repos() -> List[Path]: return git_repos_in(list(map(Path, config().roots))) @@ -192,7 +190,7 @@ def _repo_depends_on(_repo: Path) -> int: raise RuntimeError(f"Could not find a FETCH_HEAD/HEAD file in {_repo}") -def _commits(_repos: list[Path]) -> Iterator[Commit]: +def _commits(_repos: List[Path]) -> Iterator[Commit]: for r in _repos: yield from _cached_commits(r) diff --git a/my/common.py b/my/common.py index 22e9487..1b56fb5 100644 --- a/my/common.py +++ b/my/common.py @@ -1,6 +1,6 @@ from .core.warnings import high - high("DEPRECATED! Please use my.core.common instead.") from .core import __NOT_HPI_MODULE__ + from .core.common import * diff --git a/my/config.py b/my/config.py index 301bf49..2dd9cda 100644 --- a/my/config.py +++ b/my/config.py @@ -9,18 +9,17 @@ This file is used for: - mypy: this file provides some type annotations - for loading the actual user config ''' - -from __future__ import annotations - #### NOTE: you won't need this line VVVV in your personal config -from my.core import init # noqa: F401 # isort: skip +from my.core import init # noqa: F401 ### from datetime import tzinfo from pathlib import Path +from typing import List -from my.core import PathIsh, Paths + +from my.core import Paths, PathIsh class hypothesis: @@ -76,16 +75,14 @@ class google: takeout_path: Paths = '' -from collections.abc import Sequence -from datetime import date, datetime, timedelta -from typing import Union - +from typing import Sequence, Union, Tuple +from datetime import datetime, date, timedelta DateIsh = Union[datetime, date, str] -LatLon = tuple[float, float] +LatLon = Tuple[float, float] class location: # todo ugh, need to think about it... mypy wants the type here to be general, otherwise it can't deduce # and we can't import the types from the module itself, otherwise would be circular. common module? - home: LatLon | Sequence[tuple[DateIsh, LatLon]] = (1.0, -1.0) + home: Union[LatLon, Sequence[Tuple[DateIsh, LatLon]]] = (1.0, -1.0) home_accuracy = 30_000.0 class via_ip: @@ -106,8 +103,6 @@ class location: from typing import Literal - - class time: class tz: policy: Literal['keep', 'convert', 'throw'] @@ -126,9 +121,10 @@ class arbtt: logfiles: Paths +from typing import Optional class commits: - emails: Sequence[str] | None - names: Sequence[str] | None + emails: Optional[Sequence[str]] + names: Optional[Sequence[str]] roots: Sequence[PathIsh] @@ -154,8 +150,8 @@ class tinder: class instagram: class android: export_path: Paths - username: str | None - full_name: str | None + username: Optional[str] + full_name: Optional[str] class gdpr: export_path: Paths @@ -173,7 +169,7 @@ class materialistic: class fbmessenger: class fbmessengerexport: export_db: PathIsh - facebook_id: str | None + facebook_id: Optional[str] class android: export_path: Paths @@ -251,7 +247,7 @@ class runnerup: class emfit: export_path: Path timezone: tzinfo - excluded_sids: list[str] + excluded_sids: List[str] class foursquare: @@ -274,7 +270,7 @@ class roamresearch: class whatsapp: class android: export_path: Paths - my_user_id: str | None + my_user_id: Optional[str] class harmonic: diff --git a/my/core/__init__.py b/my/core/__init__.py index a8a41f4..ba633f6 100644 --- a/my/core/__init__.py +++ b/my/core/__init__.py @@ -4,7 +4,7 @@ from typing import TYPE_CHECKING from .cfg import make_config from .common import PathIsh, Paths, get_files from .compat import assert_never -from .error import Res, notnone, unwrap +from .error import Res, unwrap, notnone from .logging import ( make_logger, ) @@ -29,25 +29,22 @@ if not TYPE_CHECKING: __all__ = [ - '__NOT_HPI_MODULE__', + 'get_files', 'PathIsh', 'Paths', 'Json', - 'LazyLogger', # legacy import - 'Path', - 'PathIsh', - 'Paths', - 'Res', - 'Stats', - 'assert_never', # TODO maybe deprecate from use in my.core? will be in stdlib soon - 'dataclass', - 'datetime_aware', - 'datetime_naive', - 'get_files', - 'make_config', 'make_logger', - 'notnone', - 'stat', - 'unwrap', + 'LazyLogger', # legacy import 'warn_if_empty', + 'stat', 'Stats', + 'datetime_aware', 'datetime_naive', + 'assert_never', # TODO maybe deprecate from use in my.core? will be in stdlib soon + + 'make_config', + + '__NOT_HPI_MODULE__', + + 'Res', 'unwrap', 'notnone', + + 'dataclass', 'Path', ] @@ -55,7 +52,7 @@ __all__ = [ # you could put _init_hook.py next to your private my/config # that way you can configure logging/warnings/env variables on every HPI import try: - import my._init_hook # type: ignore[import-not-found] # noqa: F401 + import my._init_hook # type: ignore[import-not-found] except: pass ## diff --git a/my/core/__main__.py b/my/core/__main__.py index 7e2d8f9..a80aa52 100644 --- a/my/core/__main__.py +++ b/my/core/__main__.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import functools import importlib import inspect @@ -9,18 +7,17 @@ import shutil import sys import tempfile import traceback -from collections.abc import Iterable, Sequence from contextlib import ExitStack from itertools import chain from pathlib import Path from subprocess import PIPE, CompletedProcess, Popen, check_call, run -from typing import Any, Callable +from typing import Any, Callable, Iterable, List, Optional, Sequence, Type import click @functools.lru_cache -def mypy_cmd() -> Sequence[str] | None: +def mypy_cmd() -> Optional[Sequence[str]]: try: # preferably, use mypy from current python env import mypy # noqa: F401 fine not to use it @@ -35,7 +32,7 @@ def mypy_cmd() -> Sequence[str] | None: return None -def run_mypy(cfg_path: Path) -> CompletedProcess | None: +def run_mypy(cfg_path: Path) -> Optional[CompletedProcess]: # todo dunno maybe use the same mypy config in repository? # I'd need to install mypy.ini then?? env = {**os.environ} @@ -66,27 +63,21 @@ def eprint(x: str) -> None: # err=True prints to stderr click.echo(x, err=True) - def indent(x: str) -> str: - # todo use textwrap.indent? return ''.join(' ' + l for l in x.splitlines(keepends=True)) -OK = '✅' +OK = '✅' OFF = '🔲' - def info(x: str) -> None: eprint(OK + ' ' + x) - def error(x: str) -> None: eprint('❌ ' + x) - def warning(x: str) -> None: - eprint('❗ ' + x) # todo yellow? - + eprint('❗ ' + x) # todo yellow? def tb(e: Exception) -> None: tb = ''.join(traceback.format_exception(Exception, e, e.__traceback__)) @@ -95,7 +86,6 @@ def tb(e: Exception) -> None: def config_create() -> None: from .preinit import get_mycfg_dir - mycfg_dir = get_mycfg_dir() created = False @@ -104,8 +94,7 @@ def config_create() -> None: my_config = mycfg_dir / 'my' / 'config' / '__init__.py' my_config.parent.mkdir(parents=True) - my_config.write_text( - ''' + my_config.write_text(''' ### HPI personal config ## see # https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-modules @@ -128,8 +117,7 @@ class example: ### you can insert your own configuration below ### but feel free to delete the stuff above if you don't need ti -'''.lstrip() - ) +'''.lstrip()) info(f'created empty config: {my_config}') created = True else: @@ -142,13 +130,12 @@ class example: # todo return the config as a result? def config_ok() -> bool: - errors: list[Exception] = [] + errors: List[Exception] = [] # at this point 'my' should already be imported, so doesn't hurt to extract paths from it import my - try: - paths: list[str] = list(my.__path__) + paths: List[str] = list(my.__path__) except Exception as e: errors.append(e) error('failed to determine module import path') @@ -158,23 +145,19 @@ def config_ok() -> bool: # first try doing as much as possible without actually importing my.config from .preinit import get_mycfg_dir - cfg_path = get_mycfg_dir() # alternative is importing my.config and then getting cfg_path from its __file__/__path__ # not sure which is better tbh ## check we're not using stub config import my.core - try: core_pkg_path = str(Path(my.core.__path__[0]).parent) if str(cfg_path).startswith(core_pkg_path): - error( - f''' + error(f''' Seems that the stub config is used ({cfg_path}). This is likely not going to work. See https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-modules for more information -'''.strip() - ) +'''.strip()) errors.append(RuntimeError('bad config path')) except Exception as e: errors.append(e) @@ -188,6 +171,8 @@ See https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-module # use a temporary directory, useful because # - compileall ignores -B, so always craps with .pyc files (annoyng on RO filesystems) # - compileall isn't following symlinks, just silently ignores them + # note: ugh, annoying that copytree requires a non-existing dir before 3.8. + # once we have min version 3.8, can use dirs_exist_ok=True param tdir = Path(td) / 'cfg' # NOTE: compileall still returns code 0 if the path doesn't exist.. # but in our case hopefully it's not an issue @@ -196,7 +181,7 @@ See https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-module try: # this will resolve symlinks when copying # should be under try/catch since might fail if some symlinks are missing - shutil.copytree(cfg_path, tdir, dirs_exist_ok=True) + shutil.copytree(cfg_path, tdir) check_call(cmd) info('syntax check: ' + ' '.join(cmd)) except Exception as e: @@ -206,7 +191,7 @@ See https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-module ## check types mypy_res = run_mypy(cfg_path) - if mypy_res is not None: # has mypy + if mypy_res is not None: # has mypy rc = mypy_res.returncode if rc == 0: info('mypy check : success') @@ -238,7 +223,7 @@ See https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-module from .util import HPIModule, modules -def _modules(*, all: bool = False) -> Iterable[HPIModule]: +def _modules(*, all: bool=False) -> Iterable[HPIModule]: skipped = [] for m in modules(): if not all and m.skip_reason is not None: @@ -249,7 +234,7 @@ def _modules(*, all: bool = False) -> Iterable[HPIModule]: warning(f'Skipped {len(skipped)} modules: {skipped}. Pass --all if you want to see them.') -def modules_check(*, verbose: bool, list_all: bool, quick: bool, for_modules: list[str]) -> None: +def modules_check(*, verbose: bool, list_all: bool, quick: bool, for_modules: List[str]) -> None: if len(for_modules) > 0: # if you're checking specific modules, show errors # hopefully makes sense? @@ -273,7 +258,7 @@ def modules_check(*, verbose: bool, list_all: bool, quick: bool, for_modules: li # todo add a --all argument to disregard is_active check? for mr in mods: skip = mr.skip_reason - m = mr.name + m = mr.name if skip is not None: eprint(f'{OFF} {click.style("SKIP", fg="yellow")}: {m:<50} {skip}') continue @@ -323,8 +308,8 @@ def list_modules(*, list_all: bool) -> None: tabulate_warnings() for mr in _modules(all=list_all): - m = mr.name - sr = mr.skip_reason + m = mr.name + sr = mr.skip_reason if sr is None: pre = OK suf = '' @@ -340,20 +325,17 @@ def tabulate_warnings() -> None: Helper to avoid visual noise in hpi modules/doctor ''' import warnings - orig = warnings.formatwarning def override(*args, **kwargs) -> str: res = orig(*args, **kwargs) return ''.join(' ' + x for x in res.splitlines(keepends=True)) - warnings.formatwarning = override # TODO loggers as well? def _requires(modules: Sequence[str]) -> Sequence[str]: from .discovery_pure import module_by_name - mods = [module_by_name(module) for module in modules] res = [] for mod in mods: @@ -380,7 +362,7 @@ def module_requires(*, module: Sequence[str]) -> None: click.echo(x) -def module_install(*, user: bool, module: Sequence[str], parallel: bool = False, break_system_packages: bool = False) -> None: +def module_install(*, user: bool, module: Sequence[str], parallel: bool=False, break_system_packages: bool=False) -> None: if isinstance(module, str): # legacy behavior, used to take a since argument module = [module] @@ -457,7 +439,7 @@ def _ui_getchar_pick(choices: Sequence[str], prompt: str = 'Select from: ') -> i return result_map[ch] -def _locate_functions_or_prompt(qualified_names: list[str], *, prompt: bool = True) -> Iterable[Callable[..., Any]]: +def _locate_functions_or_prompt(qualified_names: List[str], *, prompt: bool = True) -> Iterable[Callable[..., Any]]: from .query import QueryException, locate_qualified_function from .stats import is_data_provider @@ -507,7 +489,6 @@ def _locate_functions_or_prompt(qualified_names: list[str], *, prompt: bool = Tr def _warn_exceptions(exc: Exception) -> None: from my.core import make_logger - logger = make_logger('CLI', level='warning') logger.exception(f'hpi query: {exc}') @@ -519,14 +500,14 @@ def query_hpi_functions( *, output: str = 'json', stream: bool = False, - qualified_names: list[str], - order_key: str | None, - order_by_value_type: type | None, + qualified_names: List[str], + order_key: Optional[str], + order_by_value_type: Optional[Type], after: Any, before: Any, within: Any, reverse: bool = False, - limit: int | None, + limit: Optional[int], drop_unsorted: bool, wrap_unsorted: bool, warn_exceptions: bool, @@ -538,9 +519,6 @@ def query_hpi_functions( # chain list of functions from user, in the order they wrote them on the CLI input_src = chain(*(f() for f in _locate_functions_or_prompt(qualified_names))) - # NOTE: if passing just one function to this which returns a single namedtuple/dataclass, - # using both --order-key and --order-type will often be faster as it does not need to - # duplicate the iterator in memory, or try to find the --order-type type on each object before sorting res = select_range( input_src, order_key=order_key, @@ -553,8 +531,7 @@ def query_hpi_functions( warn_exceptions=warn_exceptions, warn_func=_warn_exceptions, raise_exceptions=raise_exceptions, - drop_exceptions=drop_exceptions, - ) + drop_exceptions=drop_exceptions) if output == 'json': from .serialize import dumps @@ -588,7 +565,7 @@ def query_hpi_functions( # can ignore the mypy warning here, locations_to_gpx yields any errors # if you didnt pass it something that matches the LocationProtocol - for exc in locations_to_gpx(res, sys.stdout): # type: ignore[arg-type] + for exc in locations_to_gpx(res, sys.stdout): # type: ignore[arg-type] if warn_exceptions: _warn_exceptions(exc) elif raise_exceptions: @@ -605,7 +582,6 @@ def query_hpi_functions( except ModuleNotFoundError: eprint("'repl' typically uses ipython, install it with 'python3 -m pip install ipython'. falling back to stdlib...") import code - code.interact(local=locals()) else: IPython.embed() @@ -645,13 +621,13 @@ def main(*, debug: bool) -> None: @functools.lru_cache(maxsize=1) -def _all_mod_names() -> list[str]: +def _all_mod_names() -> List[str]: """Should include all modules, in case user is trying to diagnose issues""" # sort this, so that the order doesn't change while tabbing through return sorted([m.name for m in modules()]) -def _module_autocomplete(ctx: click.Context, args: Sequence[str], incomplete: str) -> list[str]: +def _module_autocomplete(ctx: click.Context, args: Sequence[str], incomplete: str) -> List[str]: return [m for m in _all_mod_names() if m.startswith(incomplete)] @@ -810,14 +786,14 @@ def query_cmd( function_name: Sequence[str], output: str, stream: bool, - order_key: str | None, - order_type: str | None, - after: str | None, - before: str | None, - within: str | None, - recent: str | None, + order_key: Optional[str], + order_type: Optional[str], + after: Optional[str], + before: Optional[str], + within: Optional[str], + recent: Optional[str], reverse: bool, - limit: int | None, + limit: Optional[int], drop_unsorted: bool, wrap_unsorted: bool, warn_exceptions: bool, @@ -853,7 +829,7 @@ def query_cmd( from datetime import date, datetime - chosen_order_type: type | None + chosen_order_type: Optional[Type] if order_type == "datetime": chosen_order_type = datetime elif order_type == "date": @@ -889,8 +865,7 @@ def query_cmd( wrap_unsorted=wrap_unsorted, warn_exceptions=warn_exceptions, raise_exceptions=raise_exceptions, - drop_exceptions=drop_exceptions, - ) + drop_exceptions=drop_exceptions) except QueryException as qe: eprint(str(qe)) sys.exit(1) @@ -905,7 +880,6 @@ def query_cmd( def test_requires() -> None: from click.testing import CliRunner - result = CliRunner().invoke(main, ['module', 'requires', 'my.github.ghexport', 'my.browser.export']) assert result.exit_code == 0 assert "github.com/karlicoss/ghexport" in result.output diff --git a/my/core/_cpu_pool.py b/my/core/_cpu_pool.py index 6b107a7..2369075 100644 --- a/my/core/_cpu_pool.py +++ b/my/core/_cpu_pool.py @@ -10,18 +10,15 @@ how many cores we want to dedicate to the DAL. Enabled by the env variable, specifying how many cores to dedicate e.g. "HPI_CPU_POOL=4 hpi query ..." """ - -from __future__ import annotations - import os from concurrent.futures import ProcessPoolExecutor -from typing import cast +from typing import Optional, cast _NOT_SET = cast(ProcessPoolExecutor, object()) -_INSTANCE: ProcessPoolExecutor | None = _NOT_SET +_INSTANCE: Optional[ProcessPoolExecutor] = _NOT_SET -def get_cpu_pool() -> ProcessPoolExecutor | None: +def get_cpu_pool() -> Optional[ProcessPoolExecutor]: global _INSTANCE if _INSTANCE is _NOT_SET: use_cpu_pool = os.environ.get('HPI_CPU_POOL') diff --git a/my/core/_deprecated/kompress.py b/my/core/_deprecated/kompress.py index c3f333f..b08f04b 100644 --- a/my/core/_deprecated/kompress.py +++ b/my/core/_deprecated/kompress.py @@ -1,17 +1,16 @@ """ Various helpers for compression """ - # fmt: off from __future__ import annotations import io import pathlib -from collections.abc import Iterator, Sequence +import sys from datetime import datetime from functools import total_ordering from pathlib import Path -from typing import IO, Union +from typing import IO, Any, Iterator, Sequence, Union PathIsh = Union[Path, str] @@ -211,7 +210,7 @@ class ZipPath(zipfile_Path): def iterdir(self) -> Iterator[ZipPath]: for s in self._as_dir().iterdir(): - yield ZipPath(s.root, s.at) + yield ZipPath(s.root, s.at) # type: ignore[attr-defined] @property def stem(self) -> str: diff --git a/my/core/cachew.py b/my/core/cachew.py index 8ce2f2b..dc6ed79 100644 --- a/my/core/cachew.py +++ b/my/core/cachew.py @@ -1,18 +1,16 @@ -from __future__ import annotations - -from .internal import assert_subpackage - -assert_subpackage(__name__) +from .internal import assert_subpackage; assert_subpackage(__name__) import logging import sys -from collections.abc import Iterator from contextlib import contextmanager from pathlib import Path from typing import ( TYPE_CHECKING, Any, Callable, + Iterator, + Optional, + Type, TypeVar, Union, cast, @@ -23,6 +21,7 @@ import appdirs # type: ignore[import-untyped] from . import warnings + PathIsh = Union[str, Path] # avoid circular import from .common @@ -61,12 +60,12 @@ def _appdirs_cache_dir() -> Path: _CACHE_DIR_NONE_HACK = Path('/tmp/hpi/cachew_none_hack') -def cache_dir(suffix: PathIsh | None = None) -> Path: +def cache_dir(suffix: Optional[PathIsh] = None) -> Path: from . import core_config as CC cdir_ = CC.config.get_cache_dir() - sp: Path | None = None + sp: Optional[Path] = None if suffix is not None: sp = Path(suffix) # guess if you do need absolute, better path it directly instead of as suffix? @@ -136,7 +135,7 @@ if TYPE_CHECKING: CC = Callable[P, R] # need to give it a name, if inlined into bound=, mypy runs in a bug PathProvider = Union[PathIsh, Callable[P, PathIsh]] # NOTE: in cachew, HashFunction type returns str - # however in practice, cachew always calls str for its result + # however in practice, cachew alwasy calls str for its result # so perhaps better to switch it to Any in cachew as well HashFunction = Callable[P, Any] @@ -145,19 +144,21 @@ if TYPE_CHECKING: # we need two versions due to @doublewrap # this is when we just annotate as @cachew without any args @overload # type: ignore[no-overload-impl] - def mcachew(fun: F) -> F: ... + def mcachew(fun: F) -> F: + ... @overload def mcachew( - cache_path: PathProvider | None = ..., + cache_path: Optional[PathProvider] = ..., *, force_file: bool = ..., - cls: type | None = ..., + cls: Optional[Type] = ..., depends_on: HashFunction = ..., - logger: logging.Logger | None = ..., + logger: Optional[logging.Logger] = ..., chunk_by: int = ..., - synthetic_key: str | None = ..., - ) -> Callable[[F], F]: ... + synthetic_key: Optional[str] = ..., + ) -> Callable[[F], F]: + ... else: mcachew = _mcachew_impl diff --git a/my/core/cfg.py b/my/core/cfg.py index 9851443..a71a7e3 100644 --- a/my/core/cfg.py +++ b/my/core/cfg.py @@ -3,32 +3,28 @@ from __future__ import annotations import importlib import re import sys -from collections.abc import Iterator from contextlib import ExitStack, contextmanager -from typing import Any, Callable, TypeVar +from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar -Attrs = dict[str, Any] +Attrs = Dict[str, Any] C = TypeVar('C') - # todo not sure about it, could be overthinking... # but short enough to change later # TODO document why it's necessary? -def make_config(cls: type[C], migration: Callable[[Attrs], Attrs] = lambda x: x) -> C: +def make_config(cls: Type[C], migration: Callable[[Attrs], Attrs]=lambda x: x) -> C: user_config = cls.__base__ old_props = { # NOTE: deliberately use gettatr to 'force' class properties here - k: getattr(user_config, k) - for k in vars(user_config) + k: getattr(user_config, k) for k in vars(user_config) } new_props = migration(old_props) from dataclasses import fields - params = { k: v for k, v in new_props.items() - if k in {f.name for f in fields(cls)} # type: ignore[arg-type] # see https://github.com/python/typing_extensions/issues/115 + if k in {f.name for f in fields(cls)} # type: ignore[arg-type] # see https://github.com/python/typing_extensions/issues/115 } # todo maybe return type here? return cls(**params) @@ -55,8 +51,6 @@ def _override_config(config: F) -> Iterator[F]: ModuleRegex = str - - @contextmanager def _reload_modules(modules: ModuleRegex) -> Iterator[None]: # need to use list here, otherwise reordering with set might mess things up @@ -87,14 +81,13 @@ def _reload_modules(modules: ModuleRegex) -> Iterator[None]: @contextmanager -def tmp_config(*, modules: ModuleRegex | None = None, config=None): +def tmp_config(*, modules: Optional[ModuleRegex]=None, config=None): if modules is None: assert config is None if modules is not None: assert config is not None import my.config - with ExitStack() as module_reload_stack, _override_config(my.config) as new_config: if config is not None: overrides = {k: v for k, v in vars(config).items() if not k.startswith('__')} @@ -109,7 +102,6 @@ def tmp_config(*, modules: ModuleRegex | None = None, config=None): def test_tmp_config() -> None: class extra: data_path = '/path/to/data' - with tmp_config() as c: assert c.google != 'whatever' assert not hasattr(c, 'extra') diff --git a/my/core/common.py b/my/core/common.py index aa994ea..a2c2ad3 100644 --- a/my/core/common.py +++ b/my/core/common.py @@ -1,18 +1,20 @@ -from __future__ import annotations - import os -from collections.abc import Iterable, Sequence from glob import glob as do_glob from pathlib import Path from typing import ( TYPE_CHECKING, Callable, Generic, + Iterable, + List, + Sequence, + Tuple, TypeVar, Union, ) -from . import compat, warnings +from . import compat +from . import warnings # some helper functions # TODO start deprecating this? soon we'd be able to use Path | str syntax which is shorter and more explicit @@ -22,22 +24,20 @@ Paths = Union[Sequence[PathIsh], PathIsh] DEFAULT_GLOB = '*' - - def get_files( pp: Paths, - glob: str = DEFAULT_GLOB, + glob: str=DEFAULT_GLOB, *, - sort: bool = True, - guess_compression: bool = True, -) -> tuple[Path, ...]: + sort: bool=True, + guess_compression: bool=True, +) -> Tuple[Path, ...]: """ Helper function to avoid boilerplate. Tuple as return type is a bit friendlier for hashing/caching, so hopefully makes sense """ # TODO FIXME mm, some wrapper to assert iterator isn't empty? - sources: list[Path] + sources: List[Path] if isinstance(pp, Path): sources = [pp] elif isinstance(pp, str): @@ -54,7 +54,7 @@ def get_files( # TODO ugh. very flaky... -3 because [, get_files(), ] return traceback.extract_stack()[-3].filename - paths: list[Path] = [] + paths: List[Path] = [] for src in sources: if src.parts[0] == '~': src = src.expanduser() @@ -63,8 +63,8 @@ def get_files( if '*' in gs: if glob != DEFAULT_GLOB: warnings.medium(f"{caller()}: treating {gs} as glob path. Explicit glob={glob} argument is ignored!") - paths.extend(map(Path, do_glob(gs))) # noqa: PTH207 - elif os.path.isdir(str(src)): # noqa: PTH112 + paths.extend(map(Path, do_glob(gs))) + elif os.path.isdir(str(src)): # NOTE: we're using os.path here on purpose instead of src.is_dir # the reason is is_dir for archives might return True and then # this clause would try globbing insize the archives @@ -157,7 +157,7 @@ def get_valid_filename(s: str) -> str: # TODO deprecate and suggest to use one from my.core directly? not sure -from .utils.itertools import unique_everseen # noqa: F401 +from .utils.itertools import unique_everseen ### legacy imports, keeping them here for backwards compatibility ## hiding behind TYPE_CHECKING so it works in runtime @@ -234,14 +234,16 @@ if not TYPE_CHECKING: return types.asdict(*args, **kwargs) # todo wrap these in deprecated decorator as well? - # TODO hmm how to deprecate these in runtime? - # tricky cause they are actually classes/types - from typing import Literal # noqa: F401 - from .cachew import mcachew # noqa: F401 # this is kinda internal, should just use my.core.logging.setup_logger if necessary from .logging import setup_logger + + # TODO hmm how to deprecate these in runtime? + # tricky cause they are actually classes/types + + from typing import Literal # noqa: F401 + from .stats import Stats from .types import ( Json, diff --git a/my/core/compat.py b/my/core/compat.py index 8f719a8..29d4f04 100644 --- a/my/core/compat.py +++ b/my/core/compat.py @@ -3,8 +3,6 @@ Contains backwards compatibility helpers for different python versions. If something is relevant to HPI itself, please put it in .hpi_compat instead ''' -from __future__ import annotations - import sys from typing import TYPE_CHECKING @@ -23,20 +21,25 @@ if not TYPE_CHECKING: # TODO warn here? source.backup(dest, **kwargs) - # keeping for runtime backwards compatibility (added in 3.9) - @deprecated('use .removeprefix method on string directly instead') - def removeprefix(text: str, prefix: str) -> str: - return text.removeprefix(prefix) - @deprecated('use .removesuffix method on string directly instead') - def removesuffix(text: str, suffix: str) -> str: - return text.removesuffix(suffix) +## can remove after python3.9 (although need to keep the method itself for bwd compat) +def removeprefix(text: str, prefix: str) -> str: + if text.startswith(prefix): + return text[len(prefix) :] + return text - ## +def removesuffix(text: str, suffix: str) -> str: + if text.endswith(suffix): + return text[:-len(suffix)] + return text +## - ## used to have compat function before 3.8 for these, keeping for runtime back compatibility +## used to have compat function before 3.8 for these, keeping for runtime back compatibility +if not TYPE_CHECKING: from functools import cached_property from typing import Literal, Protocol, TypedDict +else: + from typing_extensions import Literal, Protocol, TypedDict ## @@ -49,13 +52,13 @@ else: # bisect_left doesn't have a 'key' parameter (which we use) # till python3.10 if sys.version_info[:2] <= (3, 9): - from typing import Any, Callable, List, Optional, TypeVar # noqa: UP035 + from typing import Any, Callable, List, Optional, TypeVar X = TypeVar('X') # copied from python src # fmt: off - def bisect_left(a: list[Any], x: Any, lo: int=0, hi: int | None=None, *, key: Callable[..., Any] | None=None) -> int: + def bisect_left(a: List[Any], x: Any, lo: int=0, hi: Optional[int]=None, *, key: Optional[Callable[..., Any]]=None) -> int: if lo < 0: raise ValueError('lo must be non-negative') if hi is None: diff --git a/my/core/core_config.py b/my/core/core_config.py index 3f26c03..9036971 100644 --- a/my/core/core_config.py +++ b/my/core/core_config.py @@ -2,21 +2,18 @@ Bindings for the 'core' HPI configuration ''' -from __future__ import annotations - import re -from collections.abc import Sequence from dataclasses import dataclass from pathlib import Path +from typing import Optional, Sequence -from . import warnings +from . import PathIsh, warnings try: from my.config import core as user_config # type: ignore[attr-defined] except Exception as e: try: from my.config import common as user_config # type: ignore[attr-defined] - warnings.high("'common' config section is deprecated. Please rename it to 'core'.") except Exception as e2: # make it defensive, because it's pretty commonly used and would be annoying if it breaks hpi doctor etc. @@ -27,7 +24,6 @@ except Exception as e: _HPI_CACHE_DIR_DEFAULT = '' - @dataclass class Config(user_config): ''' @@ -38,7 +34,7 @@ class Config(user_config): cache_dir = '/your/custom/cache/path' ''' - cache_dir: Path | str | None = _HPI_CACHE_DIR_DEFAULT + cache_dir: Optional[PathIsh] = _HPI_CACHE_DIR_DEFAULT ''' Base directory for cachew. - if None , means cache is disabled @@ -48,7 +44,7 @@ class Config(user_config): NOTE: you shouldn't use this attribute in HPI modules directly, use Config.get_cache_dir()/cachew.cache_dir() instead ''' - tmp_dir: Path | str | None = None + tmp_dir: Optional[PathIsh] = None ''' Path to a temporary directory. This can be used temporarily while extracting zipfiles etc... @@ -56,36 +52,34 @@ class Config(user_config): - otherwise , use the specified directory as the base temporary directory ''' - enabled_modules: Sequence[str] | None = None + enabled_modules : Optional[Sequence[str]] = None ''' list of regexes/globs - None means 'rely on disabled_modules' ''' - disabled_modules: Sequence[str] | None = None + disabled_modules: Optional[Sequence[str]] = None ''' list of regexes/globs - None means 'rely on enabled_modules' ''' - def get_cache_dir(self) -> Path | None: + def get_cache_dir(self) -> Optional[Path]: cdir = self.cache_dir if cdir is None: return None if cdir == _HPI_CACHE_DIR_DEFAULT: from .cachew import _appdirs_cache_dir - return _appdirs_cache_dir() else: return Path(cdir).expanduser() def get_tmp_dir(self) -> Path: - tdir: Path | str | None = self.tmp_dir + tdir: Optional[PathIsh] = self.tmp_dir tpath: Path # use tempfile if unset if tdir is None: import tempfile - tpath = Path(tempfile.gettempdir()) / 'HPI' else: tpath = Path(tdir) @@ -93,10 +87,10 @@ class Config(user_config): tpath.mkdir(parents=True, exist_ok=True) return tpath - def _is_module_active(self, module: str) -> bool | None: + def _is_module_active(self, module: str) -> Optional[bool]: # None means the config doesn't specify anything # todo might be nice to return the 'reason' too? e.g. which option has matched - def matches(specs: Sequence[str]) -> str | None: + def matches(specs: Sequence[str]) -> Optional[str]: for spec in specs: # not sure because . (packages separate) matches anything, but I guess unlikely to clash if re.match(spec, module): @@ -112,10 +106,10 @@ class Config(user_config): return None else: return False - else: # not None + else: # not None if off is None: return True - else: # not None + else: # not None # fallback onto the 'enable everything', then the user will notice warnings.medium(f"[module]: conflicting regexes '{on}' and '{off}' are set in the config. Please only use one of them.") return True @@ -127,8 +121,8 @@ config = make_config(Config) ### tests start -from collections.abc import Iterator from contextlib import contextmanager as ctx +from typing import Iterator @ctx @@ -169,5 +163,4 @@ def test_active_modules() -> None: assert cc._is_module_active("my.body.exercise") is True assert len(record_warnings) == 1 - ### tests end diff --git a/my/core/denylist.py b/my/core/denylist.py index c92f9a0..92faf2c 100644 --- a/my/core/denylist.py +++ b/my/core/denylist.py @@ -5,25 +5,23 @@ A helper module for defining denylists for sources programmatically For docs, see doc/DENYLIST.md """ -from __future__ import annotations - import functools import json import sys from collections import defaultdict -from collections.abc import Iterator, Mapping from pathlib import Path -from typing import Any, TypeVar +from typing import Any, Dict, Iterator, List, Mapping, Set, TypeVar import click from more_itertools import seekable -from .serialize import dumps -from .warnings import medium +from my.core.common import PathIsh +from my.core.serialize import dumps +from my.core.warnings import medium T = TypeVar("T") -DenyMap = Mapping[str, set[Any]] +DenyMap = Mapping[str, Set[Any]] def _default_key_func(obj: T) -> str: @@ -31,9 +29,9 @@ def _default_key_func(obj: T) -> str: class DenyList: - def __init__(self, denylist_file: Path | str) -> None: + def __init__(self, denylist_file: PathIsh): self.file = Path(denylist_file).expanduser().absolute() - self._deny_raw_list: list[dict[str, Any]] = [] + self._deny_raw_list: List[Dict[str, Any]] = [] self._deny_map: DenyMap = defaultdict(set) # deny cli, user can override these @@ -47,7 +45,7 @@ class DenyList: return deny_map: DenyMap = defaultdict(set) - data: list[dict[str, Any]] = json.loads(self.file.read_text()) + data: List[Dict[str, Any]]= json.loads(self.file.read_text()) self._deny_raw_list = data for ignore in data: @@ -114,7 +112,7 @@ class DenyList: self._load() self._deny_raw({key: self._stringify_value(value)}, write=write) - def _deny_raw(self, data: dict[str, Any], *, write: bool = False) -> None: + def _deny_raw(self, data: Dict[str, Any], *, write: bool = False) -> None: self._deny_raw_list.append(data) if write: self.write() @@ -133,7 +131,7 @@ class DenyList: def _deny_cli_remember( self, items: Iterator[T], - mem: dict[str, T], + mem: Dict[str, T], ) -> Iterator[str]: keyf = self._deny_cli_key_func or _default_key_func # i.e., convert each item to a string, and map str -> item @@ -159,8 +157,10 @@ class DenyList: # reset the iterator sit.seek(0) # so we can map the selected string from fzf back to the original objects - memory_map: dict[str, T] = {} - picker = FzfPrompt(executable_path=self.fzf_path, default_options="--no-multi") + memory_map: Dict[str, T] = {} + picker = FzfPrompt( + executable_path=self.fzf_path, default_options="--no-multi" + ) picked_l = picker.prompt( self._deny_cli_remember(itr, memory_map), "--read0", diff --git a/my/core/discovery_pure.py b/my/core/discovery_pure.py index 18a19c4..b753de8 100644 --- a/my/core/discovery_pure.py +++ b/my/core/discovery_pure.py @@ -10,8 +10,6 @@ This potentially allows it to be: It should be free of external modules, importlib, exec, etc. etc. ''' -from __future__ import annotations - REQUIRES = 'REQUIRES' NOT_HPI_MODULE_VAR = '__NOT_HPI_MODULE__' @@ -21,9 +19,8 @@ import ast import logging import os import re -from collections.abc import Iterable, Sequence from pathlib import Path -from typing import Any, NamedTuple, Optional, cast +from typing import Any, Iterable, List, NamedTuple, Optional, Sequence, cast ''' None means that requirements weren't defined (different from empty requirements) @@ -33,11 +30,11 @@ Requires = Optional[Sequence[str]] class HPIModule(NamedTuple): name: str - skip_reason: str | None - doc: str | None = None - file: Path | None = None + skip_reason: Optional[str] + doc: Optional[str] = None + file: Optional[Path] = None requires: Requires = None - legacy: str | None = None # contains reason/deprecation warning + legacy: Optional[str] = None # contains reason/deprecation warning def ignored(m: str) -> bool: @@ -58,13 +55,13 @@ def has_stats(src: Path) -> bool: def _has_stats(code: str) -> bool: a: ast.Module = ast.parse(code) for x in a.body: - try: # maybe assign + try: # maybe assign [tg] = cast(Any, x).targets if tg.id == 'stats': return True except: pass - try: # maybe def? + try: # maybe def? name = cast(Any, x).name if name == 'stats': return True @@ -147,7 +144,7 @@ def all_modules() -> Iterable[HPIModule]: def _iter_my_roots() -> Iterable[Path]: import my # doesn't import any code, because of namespace package - paths: list[str] = list(my.__path__) + paths: List[str] = list(my.__path__) if len(paths) == 0: # should probably never happen?, if this code is running, it was imported # because something was added to __path__ to match this name diff --git a/my/core/error.py b/my/core/error.py index b308869..ed26dda 100644 --- a/my/core/error.py +++ b/my/core/error.py @@ -3,16 +3,19 @@ Various error handling helpers See https://beepb00p.xyz/mypy-error-handling.html#kiss for more detail """ -from __future__ import annotations - import traceback -from collections.abc import Iterable, Iterator from datetime import datetime from itertools import tee from typing import ( Any, Callable, + Iterable, + Iterator, + List, Literal, + Optional, + Tuple, + Type, TypeVar, Union, cast, @@ -30,7 +33,7 @@ Res = ResT[T, Exception] ErrorPolicy = Literal["yield", "raise", "drop"] -def notnone(x: T | None) -> T: +def notnone(x: Optional[T]) -> T: assert x is not None return x @@ -57,15 +60,13 @@ def raise_exceptions(itr: Iterable[Res[T]]) -> Iterator[T]: yield o -def warn_exceptions(itr: Iterable[Res[T]], warn_func: Callable[[Exception], None] | None = None) -> Iterator[T]: +def warn_exceptions(itr: Iterable[Res[T]], warn_func: Optional[Callable[[Exception], None]] = None) -> Iterator[T]: # if not provided, use the 'warnings' module if warn_func is None: from my.core.warnings import medium - def _warn_func(e: Exception) -> None: # TODO: print traceback? but user could always --raise-exceptions as well medium(str(e)) - warn_func = _warn_func for o in itr: @@ -80,7 +81,7 @@ def echain(ex: E, cause: Exception) -> E: return ex -def split_errors(l: Iterable[ResT[T, E]], ET: type[E]) -> tuple[Iterable[T], Iterable[E]]: +def split_errors(l: Iterable[ResT[T, E]], ET: Type[E]) -> Tuple[Iterable[T], Iterable[E]]: # TODO would be nice to have ET=Exception default? but it causes some mypy complaints? vit, eit = tee(l) # TODO ugh, not sure if I can reconcile type checking and runtime and convince mypy that ET and E are the same type? @@ -98,9 +99,7 @@ def split_errors(l: Iterable[ResT[T, E]], ET: type[E]) -> tuple[Iterable[T], Ite K = TypeVar('K') - - -def sort_res_by(items: Iterable[Res[T]], key: Callable[[Any], K]) -> list[Res[T]]: +def sort_res_by(items: Iterable[Res[T]], key: Callable[[Any], K]) -> List[Res[T]]: """ Sort a sequence potentially interleaved with errors/entries on which the key can't be computed. The general idea is: the error sticks to the non-error entry that follows it @@ -108,7 +107,7 @@ def sort_res_by(items: Iterable[Res[T]], key: Callable[[Any], K]) -> list[Res[T] group = [] groups = [] for i in items: - k: K | None + k: Optional[K] try: k = key(i) except Exception: # error white computing key? dunno, might be nice to handle... @@ -118,10 +117,10 @@ def sort_res_by(items: Iterable[Res[T]], key: Callable[[Any], K]) -> list[Res[T] groups.append((k, group)) group = [] - results: list[Res[T]] = [] - for _v, grp in sorted(groups, key=lambda p: p[0]): # type: ignore[return-value, arg-type] # TODO SupportsLessThan?? + results: List[Res[T]] = [] + for _v, grp in sorted(groups, key=lambda p: p[0]): # type: ignore[return-value, arg-type] # TODO SupportsLessThan?? results.extend(grp) - results.extend(group) # handle last group (it will always be errors only) + results.extend(group) # handle last group (it will always be errors only) return results @@ -163,20 +162,20 @@ def test_sort_res_by() -> None: # helpers to associate timestamps with the errors (so something meaningful could be displayed on the plots, for example) # todo document it under 'patterns' somewhere... # todo proper typevar? -def set_error_datetime(e: Exception, dt: datetime | None) -> None: +def set_error_datetime(e: Exception, dt: Optional[datetime]) -> None: if dt is None: return e.args = (*e.args, dt) # todo not sure if should return new exception? -def attach_dt(e: Exception, *, dt: datetime | None) -> Exception: +def attach_dt(e: Exception, *, dt: Optional[datetime]) -> Exception: set_error_datetime(e, dt) return e # todo it might be problematic because might mess with timezones (when it's converted to string, it's converted to a shift) -def extract_error_datetime(e: Exception) -> datetime | None: +def extract_error_datetime(e: Exception) -> Optional[datetime]: import re for x in reversed(e.args): @@ -202,10 +201,10 @@ MODULE_SETUP_URL = 'https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#p def warn_my_config_import_error( - err: ImportError | AttributeError, + err: Union[ImportError, AttributeError], *, - help_url: str | None = None, - module_name: str | None = None, + help_url: Optional[str] = None, + module_name: Optional[str] = None, ) -> bool: """ If the user tried to import something from my.config but it failed, @@ -266,7 +265,7 @@ def test_datetime_errors() -> None: import pytz # noqa: I001 dt_notz = datetime.now() - dt_tz = datetime.now(tz=pytz.timezone('Europe/Amsterdam')) + dt_tz = datetime.now(tz=pytz.timezone('Europe/Amsterdam')) for dt in [dt_tz, dt_notz]: e1 = RuntimeError('whatever') assert extract_error_datetime(e1) is None diff --git a/my/core/experimental.py b/my/core/experimental.py index 0a1c3b4..1a78272 100644 --- a/my/core/experimental.py +++ b/my/core/experimental.py @@ -1,8 +1,6 @@ -from __future__ import annotations - import sys import types -from typing import Any +from typing import Any, Dict, Optional # The idea behind this one is to support accessing "overlaid/shadowed" modules from namespace packages @@ -22,7 +20,7 @@ def import_original_module( file: str, *, star: bool = False, - globals: dict[str, Any] | None = None, + globals: Optional[Dict[str, Any]] = None, ) -> types.ModuleType: module_to_restore = sys.modules[module_name] diff --git a/my/core/freezer.py b/my/core/freezer.py index 4fb0e25..93bceb7 100644 --- a/my/core/freezer.py +++ b/my/core/freezer.py @@ -1,29 +1,29 @@ -from __future__ import annotations +from .internal import assert_subpackage; assert_subpackage(__name__) -from .internal import assert_subpackage - -assert_subpackage(__name__) - -import dataclasses +import dataclasses as dcl import inspect -from typing import Any, Generic, TypeVar +from typing import Any, Type, TypeVar D = TypeVar('D') -def _freeze_dataclass(Orig: type[D]): - ofields = [(f.name, f.type, f) for f in dataclasses.fields(Orig)] # type: ignore[arg-type] # see https://github.com/python/typing_extensions/issues/115 +def _freeze_dataclass(Orig: Type[D]): + ofields = [(f.name, f.type, f) for f in dcl.fields(Orig)] # type: ignore[arg-type] # see https://github.com/python/typing_extensions/issues/115 # extract properties along with their types - props = list(inspect.getmembers(Orig, lambda o: isinstance(o, property))) + props = list(inspect.getmembers(Orig, lambda o: isinstance(o, property))) pfields = [(name, inspect.signature(getattr(prop, 'fget')).return_annotation) for name, prop in props] # FIXME not sure about name? # NOTE: sadly passing bases=[Orig] won't work, python won't let us override properties with fields - RRR = dataclasses.make_dataclass('RRR', fields=[*ofields, *pfields]) + RRR = dcl.make_dataclass('RRR', fields=[*ofields, *pfields]) # todo maybe even declare as slots? return props, RRR +# todo need some decorator thingie? +from typing import Generic + + class Freezer(Generic[D]): ''' Some magic which converts dataclass properties into fields. @@ -31,13 +31,13 @@ class Freezer(Generic[D]): For now only supports dataclasses. ''' - def __init__(self, Orig: type[D]) -> None: + def __init__(self, Orig: Type[D]) -> None: self.Orig = Orig self.props, self.Frozen = _freeze_dataclass(Orig) def freeze(self, value: D) -> D: pvalues = {name: getattr(value, name) for name, _ in self.props} - return self.Frozen(**dataclasses.asdict(value), **pvalues) # type: ignore[call-overload] # see https://github.com/python/typing_extensions/issues/115 + return self.Frozen(**dcl.asdict(value), **pvalues) # type: ignore[call-overload] # see https://github.com/python/typing_extensions/issues/115 ### tests @@ -45,7 +45,7 @@ class Freezer(Generic[D]): # this needs to be defined here to prevent a mypy bug # see https://github.com/python/mypy/issues/7281 -@dataclasses.dataclass +@dcl.dataclass class _A: x: Any @@ -71,7 +71,6 @@ def test_freezer() -> None: assert fd['typed'] == 123 assert fd['untyped'] == [1, 2, 3] - ### # TODO shit. what to do with exceptions? diff --git a/my/core/hpi_compat.py b/my/core/hpi_compat.py index 3687483..949046d 100644 --- a/my/core/hpi_compat.py +++ b/my/core/hpi_compat.py @@ -3,14 +3,11 @@ Contains various backwards compatibility/deprecation helpers relevant to HPI its (as opposed to .compat module which implements compatibility between python versions) """ -from __future__ import annotations - import inspect import os import re -from collections.abc import Iterator, Sequence from types import ModuleType -from typing import TypeVar +from typing import Iterator, List, Optional, Sequence, TypeVar from . import warnings @@ -18,7 +15,7 @@ from . import warnings def handle_legacy_import( parent_module_name: str, legacy_submodule_name: str, - parent_module_path: list[str], + parent_module_path: List[str], ) -> bool: ### # this is to trick mypy into treating this as a proper namespace package @@ -125,8 +122,8 @@ class always_supports_sequence(Iterator[V]): def __init__(self, it: Iterator[V]) -> None: self._it = it - self._list: list[V] | None = None - self._lit: Iterator[V] | None = None + self._list: Optional[List[V]] = None + self._lit: Optional[Iterator[V]] = None def __iter__(self) -> Iterator[V]: # noqa: PYI034 if self._list is not None: @@ -145,7 +142,7 @@ class always_supports_sequence(Iterator[V]): return getattr(self._it, name) @property - def _aslist(self) -> list[V]: + def _aslist(self) -> List[V]: if self._list is None: qualname = getattr(self._it, '__qualname__', '') # defensive just in case warnings.medium(f'Using {qualname} as list is deprecated. Migrate to iterative processing or call list() explicitly.') diff --git a/my/core/influxdb.py b/my/core/influxdb.py index 78a439a..25eeba1 100644 --- a/my/core/influxdb.py +++ b/my/core/influxdb.py @@ -2,14 +2,9 @@ TODO doesn't really belong to 'core' morally, but can think of moving out later ''' -from __future__ import annotations +from .internal import assert_subpackage; assert_subpackage(__name__) -from .internal import assert_subpackage - -assert_subpackage(__name__) - -from collections.abc import Iterable -from typing import Any +from typing import Any, Dict, Iterable, Optional import click @@ -26,7 +21,7 @@ class config: RESET_DEFAULT = False -def fill(it: Iterable[Any], *, measurement: str, reset: bool = RESET_DEFAULT, dt_col: str = 'dt') -> None: +def fill(it: Iterable[Any], *, measurement: str, reset: bool=RESET_DEFAULT, dt_col: str='dt') -> None: # todo infer dt column automatically, reuse in stat? # it doesn't like dots, ends up some syntax error? measurement = measurement.replace('.', '_') @@ -35,7 +30,6 @@ def fill(it: Iterable[Any], *, measurement: str, reset: bool = RESET_DEFAULT, dt db = config.db from influxdb import InfluxDBClient # type: ignore - client = InfluxDBClient() # todo maybe create if not exists? # client.create_database(db) @@ -46,7 +40,7 @@ def fill(it: Iterable[Any], *, measurement: str, reset: bool = RESET_DEFAULT, dt client.delete_series(database=db, measurement=measurement) # TODO need to take schema here... - cache: dict[str, bool] = {} + cache: Dict[str, bool] = {} def good(f, v) -> bool: c = cache.get(f) @@ -65,9 +59,9 @@ def fill(it: Iterable[Any], *, measurement: str, reset: bool = RESET_DEFAULT, dt def dit() -> Iterable[Json]: for i in it: d = asdict(i) - tags: Json | None = None - tags_ = d.get('tags') # meh... handle in a more robust manner - if tags_ is not None and isinstance(tags_, dict): # FIXME meh. + tags: Optional[Json] = None + tags_ = d.get('tags') # meh... handle in a more robust manner + if tags_ is not None and isinstance(tags_, dict): # FIXME meh. del d['tags'] tags = tags_ @@ -90,7 +84,6 @@ def fill(it: Iterable[Any], *, measurement: str, reset: bool = RESET_DEFAULT, dt } from more_itertools import chunked - # "The optimal batch size is 5000 lines of line protocol." # some chunking is def necessary, otherwise it fails inserted = 0 @@ -104,9 +97,9 @@ def fill(it: Iterable[Any], *, measurement: str, reset: bool = RESET_DEFAULT, dt # todo "Specify timestamp precision when writing to InfluxDB."? -def magic_fill(it, *, name: str | None = None, reset: bool = RESET_DEFAULT) -> None: +def magic_fill(it, *, name: Optional[str]=None, reset: bool=RESET_DEFAULT) -> None: if name is None: - assert callable(it) # generators have no name/module + assert callable(it) # generators have no name/module name = f'{it.__module__}:{it.__name__}' assert name is not None @@ -116,7 +109,6 @@ def magic_fill(it, *, name: str | None = None, reset: bool = RESET_DEFAULT) -> N from itertools import tee from more_itertools import first, one - it, x = tee(it) f = first(x, default=None) if f is None: @@ -126,11 +118,9 @@ def magic_fill(it, *, name: str | None = None, reset: bool = RESET_DEFAULT) -> N # TODO can we reuse pandas code or something? # from .pandas import _as_columns - schema = _as_columns(type(f)) from datetime import datetime - dtex = RuntimeError(f'expected single datetime field. schema: {schema}') dtf = one((f for f, t in schema.items() if t == datetime), too_short=dtex, too_long=dtex) @@ -147,7 +137,6 @@ def main() -> None: @click.argument('FUNCTION_NAME', type=str, required=True) def populate(*, function_name: str, reset: bool) -> None: from .__main__ import _locate_functions_or_prompt - [provider] = list(_locate_functions_or_prompt([function_name])) # todo could have a non-interactive version which populates from all data sources for the provider? magic_fill(provider, reset=reset) diff --git a/my/core/init.py b/my/core/init.py index 644c7b4..7a30955 100644 --- a/my/core/init.py +++ b/my/core/init.py @@ -19,7 +19,6 @@ def setup_config() -> None: from pathlib import Path from .preinit import get_mycfg_dir - mycfg_dir = get_mycfg_dir() if not mycfg_dir.exists(): @@ -44,7 +43,6 @@ See https://github.com/karlicoss/HPI/blob/master/doc/SETUP.org#setting-up-the-mo except ImportError as ex: # just in case... who knows what crazy setup users have import logging - logging.exception(ex) warnings.warn(f""" Importing 'my.config' failed! (error: {ex}). This is likely to result in issues. diff --git a/my/core/kompress.py b/my/core/kompress.py index 8accb2d..7cbf310 100644 --- a/my/core/kompress.py +++ b/my/core/kompress.py @@ -1,6 +1,4 @@ -from .internal import assert_subpackage - -assert_subpackage(__name__) +from .internal import assert_subpackage; assert_subpackage(__name__) from . import warnings diff --git a/my/core/konsume.py b/my/core/konsume.py index 41b5a4e..0e4a2fe 100644 --- a/my/core/konsume.py +++ b/my/core/konsume.py @@ -5,21 +5,17 @@ This can potentially allow both for safer defensive parsing, and let you know if TODO perhaps need to get some inspiration from linear logic to decide on a nice API... ''' -from __future__ import annotations - from collections import OrderedDict -from typing import Any +from typing import Any, List def ignore(w, *keys): for k in keys: w[k].ignore() - def zoom(w, *keys): return [w[k].zoom() for k in keys] - # TODO need to support lists class Zoomable: def __init__(self, parent, *args, **kwargs) -> None: @@ -44,7 +40,7 @@ class Zoomable: assert self.parent is not None self.parent._remove(self) - def zoom(self) -> Zoomable: + def zoom(self) -> 'Zoomable': self.consume() return self @@ -67,7 +63,6 @@ class Wdict(Zoomable, OrderedDict): def this_consumed(self): return len(self) == 0 - # TODO specify mypy type for the index special method? @@ -82,7 +77,6 @@ class Wlist(Zoomable, list): def this_consumed(self): return len(self) == 0 - class Wvalue(Zoomable): def __init__(self, parent, value: Any) -> None: super().__init__(parent) @@ -93,20 +87,23 @@ class Wvalue(Zoomable): return [] def this_consumed(self): - return True # TODO not sure.. + return True # TODO not sure.. def __repr__(self): return 'WValue{' + repr(self.value) + '}' -def _wrap(j, parent=None) -> tuple[Zoomable, list[Zoomable]]: +from typing import Tuple + + +def _wrap(j, parent=None) -> Tuple[Zoomable, List[Zoomable]]: res: Zoomable - cc: list[Zoomable] + cc: List[Zoomable] if isinstance(j, dict): res = Wdict(parent) cc = [res] for k, v in j.items(): - vv, c = _wrap(v, parent=res) + vv, c = _wrap(v, parent=res) res[k] = vv cc.extend(c) return res, cc @@ -125,14 +122,13 @@ def _wrap(j, parent=None) -> tuple[Zoomable, list[Zoomable]]: raise RuntimeError(f'Unexpected type: {type(j)} {j}') -from collections.abc import Iterator from contextlib import contextmanager +from typing import Iterator class UnconsumedError(Exception): pass - # TODO think about error policy later... @contextmanager def wrap(j, *, throw=True) -> Iterator[Zoomable]: @@ -141,7 +137,7 @@ def wrap(j, *, throw=True) -> Iterator[Zoomable]: yield w for c in children: - if not c.this_consumed(): # TODO hmm. how does it figure out if it's consumed??? + if not c.this_consumed(): # TODO hmm. how does it figure out if it's consumed??? if throw: # TODO need to keep a full path or something... raise UnconsumedError(f''' @@ -157,7 +153,6 @@ from typing import cast def test_unconsumed() -> None: import pytest - with pytest.raises(UnconsumedError): with wrap({'a': 1234}) as w: w = cast(Wdict, w) @@ -168,7 +163,6 @@ def test_unconsumed() -> None: w = cast(Wdict, w) d = w['c']['d'].zoom() - def test_consumed() -> None: with wrap({'a': 1234}) as w: w = cast(Wdict, w) @@ -179,7 +173,6 @@ def test_consumed() -> None: c = w['c'].zoom() d = c['d'].zoom() - def test_types() -> None: # (string, number, object, array, boolean or nul with wrap({'string': 'string', 'number': 3.14, 'boolean': True, 'null': None, 'list': [1, 2, 3]}) as w: @@ -188,10 +181,9 @@ def test_types() -> None: w['number'].consume() w['boolean'].zoom() w['null'].zoom() - for x in list(w['list'].zoom()): # TODO eh. how to avoid the extra list thing? + for x in list(w['list'].zoom()): # TODO eh. how to avoid the extra list thing? x.consume() - def test_consume_all() -> None: with wrap({'aaa': {'bbb': {'hi': 123}}}) as w: w = cast(Wdict, w) @@ -201,9 +193,11 @@ def test_consume_all() -> None: def test_consume_few() -> None: import pytest - pytest.skip('Will think about it later..') - with wrap({'important': 123, 'unimportant': 'whatever'}) as w: + with wrap({ + 'important': 123, + 'unimportant': 'whatever' + }) as w: w = cast(Wdict, w) w['important'].zoom() w.consume_all() @@ -212,7 +206,6 @@ def test_consume_few() -> None: def test_zoom() -> None: import pytest - with wrap({'aaa': 'whatever'}) as w: w = cast(Wdict, w) with pytest.raises(KeyError): @@ -236,7 +229,7 @@ def test_zoom() -> None: # - very flexible, easy to adjust behaviour # - cons: # - can forget to assert about extra entities etc, so error prone -# - if we do something like =assert j.pop('status') == 200, j=, by the time assert happens we already popped item -- makes error handling harder +# - if we do something like =assert j.pop('status') == 200, j=, by the time assert happens we already popped item -- makes erro handling harder # - a bit verbose.. so probably requires some helper functions though (could be much leaner than current konsume though) # - if we assert, then terminates parsing too early, if we're defensive then inflates the code a lot with if statements # - TODO perhaps combine warnings somehow or at least only emit once per module? diff --git a/my/core/logging.py b/my/core/logging.py index 167a167..bdee9aa 100644 --- a/my/core/logging.py +++ b/my/core/logging.py @@ -250,7 +250,7 @@ if __name__ == '__main__': test() -## legacy/deprecated methods for backwards compatibility +## legacy/deprecated methods for backwards compatilibity if not TYPE_CHECKING: from .compat import deprecated diff --git a/my/core/mime.py b/my/core/mime.py index 8235960..cf5bdf5 100644 --- a/my/core/mime.py +++ b/my/core/mime.py @@ -2,14 +2,11 @@ Utils for mime/filetype handling """ -from __future__ import annotations - -from .internal import assert_subpackage - -assert_subpackage(__name__) +from .internal import assert_subpackage; assert_subpackage(__name__) import functools -from pathlib import Path + +from .common import PathIsh @functools.lru_cache(1) @@ -26,7 +23,7 @@ import mimetypes # todo do I need init()? # todo wtf? fastermime thinks it's mime is application/json even if the extension is xz?? # whereas magic detects correctly: application/x-zstd and application/x-xz -def fastermime(path: Path | str) -> str: +def fastermime(path: PathIsh) -> str: paths = str(path) # mimetypes is faster, so try it first (mime, _) = mimetypes.guess_type(paths) diff --git a/my/core/orgmode.py b/my/core/orgmode.py index 96c09a4..979f288 100644 --- a/my/core/orgmode.py +++ b/my/core/orgmode.py @@ -1,7 +1,6 @@ """ Various helpers for reading org-mode data """ - from datetime import datetime @@ -23,20 +22,17 @@ def parse_org_datetime(s: str) -> datetime: # TODO I guess want to borrow inspiration from bs4? element type <-> tag; and similar logic for find_one, find_all -from collections.abc import Iterable -from typing import Callable, TypeVar +from typing import Callable, Iterable, TypeVar from orgparse import OrgNode V = TypeVar('V') - def collect(n: OrgNode, cfun: Callable[[OrgNode], Iterable[V]]) -> Iterable[V]: yield from cfun(n) for c in n.children: yield from collect(c, cfun) - from more_itertools import one from orgparse.extra import Table @@ -50,7 +46,7 @@ class TypedTable(Table): tt = super().__new__(TypedTable) tt.__dict__ = orig.__dict__ blocks = list(orig.blocks) - header = blocks[0] # fist block is schema + header = blocks[0] # fist block is schema if len(header) == 2: # TODO later interpret first line as types header = header[1:] diff --git a/my/core/pandas.py b/my/core/pandas.py index d444965..d38465a 100644 --- a/my/core/pandas.py +++ b/my/core/pandas.py @@ -7,14 +7,17 @@ from __future__ import annotations # todo not sure if belongs to 'core'. It's certainly 'more' core than actual modules, but still not essential # NOTE: this file is meant to be importable without Pandas installed import dataclasses -from collections.abc import Iterable, Iterator from datetime import datetime, timezone from pprint import pformat from typing import ( TYPE_CHECKING, Any, Callable, + Dict, + Iterable, + Iterator, Literal, + Type, TypeVar, ) @@ -175,10 +178,10 @@ def _to_jsons(it: Iterable[Res[Any]]) -> Iterable[Json]: Schema = Any -def _as_columns(s: Schema) -> dict[str, type]: +def _as_columns(s: Schema) -> Dict[str, Type]: # todo would be nice to extract properties; add tests for this as well if dataclasses.is_dataclass(s): - return {f.name: f.type for f in dataclasses.fields(s)} # type: ignore[misc] # ugh, why mypy thinks f.type can return str?? + return {f.name: f.type for f in dataclasses.fields(s)} # else must be NamedTuple?? # todo assert my.core.common.is_namedtuple? return getattr(s, '_field_types') diff --git a/my/core/preinit.py b/my/core/preinit.py index eb3a34f..be5477b 100644 --- a/my/core/preinit.py +++ b/my/core/preinit.py @@ -8,7 +8,6 @@ def get_mycfg_dir() -> Path: import os import appdirs # type: ignore[import-untyped] - # not sure if that's necessary, i.e. could rely on PYTHONPATH instead # on the other hand, by using MY_CONFIG we are guaranteed to load it from the desired path? mvar = os.environ.get('MY_CONFIG') diff --git a/my/core/pytest.py b/my/core/pytest.py index ad9e7d7..e514957 100644 --- a/my/core/pytest.py +++ b/my/core/pytest.py @@ -2,9 +2,7 @@ Helpers to prevent depending on pytest in runtime """ -from .internal import assert_subpackage - -assert_subpackage(__name__) +from .internal import assert_subpackage; assert_subpackage(__name__) import sys import typing diff --git a/my/core/query.py b/my/core/query.py index 50724a7..45806fb 100644 --- a/my/core/query.py +++ b/my/core/query.py @@ -5,20 +5,23 @@ The main entrypoint to this library is the 'select' function below; try: python3 -c "from my.core.query import select; help(select)" """ -from __future__ import annotations - import dataclasses import importlib import inspect import itertools -from collections.abc import Iterable, Iterator from datetime import datetime from typing import ( Any, Callable, + Dict, + Iterable, + Iterator, + List, NamedTuple, Optional, + Tuple, TypeVar, + Union, ) import more_itertools @@ -48,7 +51,6 @@ class Unsortable(NamedTuple): class QueryException(ValueError): """Used to differentiate query-related errors, so the CLI interface is more expressive""" - pass @@ -61,7 +63,7 @@ def locate_function(module_name: str, function_name: str) -> Callable[[], Iterab """ try: mod = importlib.import_module(module_name) - for fname, f in inspect.getmembers(mod, inspect.isfunction): + for (fname, f) in inspect.getmembers(mod, inspect.isfunction): if fname == function_name: return f # in case the function is defined dynamically, @@ -81,10 +83,10 @@ def locate_qualified_function(qualified_name: str) -> Callable[[], Iterable[ET]] if "." not in qualified_name: raise QueryException("Could not find a '.' in the function name, e.g. my.reddit.rexport.comments") rdot_index = qualified_name.rindex(".") - return locate_function(qualified_name[:rdot_index], qualified_name[rdot_index + 1 :]) + return locate_function(qualified_name[:rdot_index], qualified_name[rdot_index + 1:]) -def attribute_func(obj: T, where: Where, default: U | None = None) -> OrderFunc | None: +def attribute_func(obj: T, where: Where, default: Optional[U] = None) -> Optional[OrderFunc]: """ Attempts to find an attribute which matches the 'where_function' on the object, using some getattr/dict checks. Returns a function which when called with @@ -131,11 +133,11 @@ def attribute_func(obj: T, where: Where, default: U | None = None) -> OrderFunc def _generate_order_by_func( obj_res: Res[T], *, - key: str | None = None, - where_function: Where | None = None, - default: U | None = None, + key: Optional[str] = None, + where_function: Optional[Where] = None, + default: Optional[U] = None, force_unsortable: bool = False, -) -> OrderFunc | None: +) -> Optional[OrderFunc]: """ Accepts an object Res[T] (Instance of some class or Exception) @@ -200,7 +202,7 @@ pass 'drop_exceptions' to ignore exceptions""") # user must provide either a key or a where predicate if where_function is not None: - func: OrderFunc | None = attribute_func(obj, where_function, default) + func: Optional[OrderFunc] = attribute_func(obj, where_function, default) if func is not None: return func @@ -216,6 +218,8 @@ pass 'drop_exceptions' to ignore exceptions""") return None # couldn't compute a OrderFunc for this class/instance + + # currently using the 'key set' as a proxy for 'this is the same type of thing' def _determine_order_by_value_key(obj_res: ET) -> Any: """ @@ -240,7 +244,7 @@ def _drop_unsorted(itr: Iterator[ET], orderfunc: OrderFunc) -> Iterator[ET]: # try getting the first value from the iterator # similar to my.core.common.warn_if_empty? this doesn't go through the whole iterator though -def _peek_iter(itr: Iterator[ET]) -> tuple[ET | None, Iterator[ET]]: +def _peek_iter(itr: Iterator[ET]) -> Tuple[Optional[ET], Iterator[ET]]: itr = more_itertools.peekable(itr) try: first_item = itr.peek() @@ -251,9 +255,9 @@ def _peek_iter(itr: Iterator[ET]) -> tuple[ET | None, Iterator[ET]]: # similar to 'my.core.error.sort_res_by'? -def _wrap_unsorted(itr: Iterator[ET], orderfunc: OrderFunc) -> tuple[Iterator[Unsortable], Iterator[ET]]: - unsortable: list[Unsortable] = [] - sortable: list[ET] = [] +def _wrap_unsorted(itr: Iterator[ET], orderfunc: OrderFunc) -> Tuple[Iterator[Unsortable], Iterator[ET]]: + unsortable: List[Unsortable] = [] + sortable: List[ET] = [] for o in itr: # if input to select was another select if isinstance(o, Unsortable): @@ -275,7 +279,7 @@ def _handle_unsorted( orderfunc: OrderFunc, drop_unsorted: bool, wrap_unsorted: bool -) -> tuple[Iterator[Unsortable], Iterator[ET]]: +) -> Tuple[Iterator[Unsortable], Iterator[ET]]: # prefer drop_unsorted to wrap_unsorted, if both were present if drop_unsorted: return iter([]), _drop_unsorted(itr, orderfunc) @@ -290,16 +294,16 @@ def _handle_unsorted( # different types. ***This consumes the iterator***, so # you should definitely itertoolts.tee it beforehand # as to not exhaust the values -def _generate_order_value_func(itr: Iterator[ET], order_value: Where, default: U | None = None) -> OrderFunc: +def _generate_order_value_func(itr: Iterator[ET], order_value: Where, default: Optional[U] = None) -> OrderFunc: # TODO: add a kwarg to force lookup for every item? would sort of be like core.common.guess_datetime then - order_by_lookup: dict[Any, OrderFunc] = {} + order_by_lookup: Dict[Any, OrderFunc] = {} # need to go through a copy of the whole iterator here to # pre-generate functions to support sorting mixed types for obj_res in itr: key: Any = _determine_order_by_value_key(obj_res) if key not in order_by_lookup: - keyfunc: OrderFunc | None = _generate_order_by_func( + keyfunc: Optional[OrderFunc] = _generate_order_by_func( obj_res, where_function=order_value, default=default, @@ -320,12 +324,12 @@ def _generate_order_value_func(itr: Iterator[ET], order_value: Where, default: U def _handle_generate_order_by( itr, *, - order_by: OrderFunc | None = None, - order_key: str | None = None, - order_value: Where | None = None, - default: U | None = None, -) -> tuple[OrderFunc | None, Iterator[ET]]: - order_by_chosen: OrderFunc | None = order_by # if the user just supplied a function themselves + order_by: Optional[OrderFunc] = None, + order_key: Optional[str] = None, + order_value: Optional[Where] = None, + default: Optional[U] = None, +) -> Tuple[Optional[OrderFunc], Iterator[ET]]: + order_by_chosen: Optional[OrderFunc] = order_by # if the user just supplied a function themselves if order_by is not None: return order_by, itr if order_key is not None: @@ -350,19 +354,19 @@ def _handle_generate_order_by( def select( - src: Iterable[ET] | Callable[[], Iterable[ET]], + src: Union[Iterable[ET], Callable[[], Iterable[ET]]], *, - where: Where | None = None, - order_by: OrderFunc | None = None, - order_key: str | None = None, - order_value: Where | None = None, - default: U | None = None, + where: Optional[Where] = None, + order_by: Optional[OrderFunc] = None, + order_key: Optional[str] = None, + order_value: Optional[Where] = None, + default: Optional[U] = None, reverse: bool = False, - limit: int | None = None, + limit: Optional[int] = None, drop_unsorted: bool = False, wrap_unsorted: bool = True, warn_exceptions: bool = False, - warn_func: Callable[[Exception], None] | None = None, + warn_func: Optional[Callable[[Exception], None]] = None, drop_exceptions: bool = False, raise_exceptions: bool = False, ) -> Iterator[ET]: @@ -613,7 +617,7 @@ class _B(NamedTuple): # move these to tests/? They are re-used so much in the tests below, # not sure where the best place for these is -def _mixed_iter() -> Iterator[_A | _B]: +def _mixed_iter() -> Iterator[Union[_A, _B]]: yield _A(x=datetime(year=2009, month=5, day=10, hour=4, minute=10, second=1), y=5, z=10) yield _B(y=datetime(year=2015, month=5, day=10, hour=4, minute=10, second=1)) yield _A(x=datetime(year=2005, month=5, day=10, hour=4, minute=10, second=1), y=10, z=2) @@ -622,7 +626,7 @@ def _mixed_iter() -> Iterator[_A | _B]: yield _A(x=datetime(year=2005, month=4, day=10, hour=4, minute=10, second=1), y=2, z=-5) -def _mixed_iter_errors() -> Iterator[Res[_A | _B]]: +def _mixed_iter_errors() -> Iterator[Res[Union[_A, _B]]]: m = _mixed_iter() yield from itertools.islice(m, 0, 3) yield RuntimeError("Unhandled error!") diff --git a/my/core/query_range.py b/my/core/query_range.py index 83728bf..1f4a7ff 100644 --- a/my/core/query_range.py +++ b/my/core/query_range.py @@ -7,14 +7,11 @@ filtered iterator See the select_range function below """ -from __future__ import annotations - import re import time -from collections.abc import Iterator from datetime import date, datetime, timedelta -from functools import cache -from typing import Any, Callable, NamedTuple +from functools import lru_cache +from typing import Any, Callable, Iterator, NamedTuple, Optional, Type import more_itertools @@ -28,9 +25,7 @@ from .query import ( select, ) -timedelta_regex = re.compile( - r"^((?P[\.\d]+?)w)?((?P[\.\d]+?)d)?((?P[\.\d]+?)h)?((?P[\.\d]+?)m)?((?P[\.\d]+?)s)?$" -) +timedelta_regex = re.compile(r"^((?P[\.\d]+?)w)?((?P[\.\d]+?)d)?((?P[\.\d]+?)h)?((?P[\.\d]+?)m)?((?P[\.\d]+?)s)?$") # https://stackoverflow.com/a/51916936 @@ -93,7 +88,7 @@ def parse_datetime_float(date_str: str) -> float: # dateparser is a bit more lenient than the above, lets you type # all sorts of dates as inputs # https://github.com/scrapinghub/dateparser#how-to-use - res: datetime | None = dateparser.parse(ds, settings={"DATE_ORDER": "YMD"}) + res: Optional[datetime] = dateparser.parse(ds, settings={"DATE_ORDER": "YMD"}) if res is not None: return res.timestamp() @@ -103,7 +98,7 @@ def parse_datetime_float(date_str: str) -> float: # probably DateLike input? but a user could specify an order_key # which is an epoch timestamp or a float value which they # expect to be converted to a datetime to compare -@cache +@lru_cache(maxsize=None) def _datelike_to_float(dl: Any) -> float: if isinstance(dl, datetime): return dl.timestamp() @@ -135,12 +130,11 @@ class RangeTuple(NamedTuple): of the timeframe -- 'before' - before and after - anything after 'after' and before 'before', acts as a time range """ - # technically doesn't need to be Optional[Any], # just to make it more clear these can be None - after: Any | None - before: Any | None - within: Any | None + after: Optional[Any] + before: Optional[Any] + within: Optional[Any] Converter = Callable[[Any], Any] @@ -151,9 +145,9 @@ def _parse_range( unparsed_range: RangeTuple, end_parser: Converter, within_parser: Converter, - parsed_range: RangeTuple | None = None, - error_message: str | None = None, -) -> RangeTuple | None: + parsed_range: Optional[RangeTuple] = None, + error_message: Optional[str] = None +) -> Optional[RangeTuple]: if parsed_range is not None: return parsed_range @@ -182,11 +176,11 @@ def _create_range_filter( end_parser: Converter, within_parser: Converter, attr_func: Where, - parsed_range: RangeTuple | None = None, - default_before: Any | None = None, - value_coercion_func: Converter | None = None, - error_message: str | None = None, -) -> Where | None: + parsed_range: Optional[RangeTuple] = None, + default_before: Optional[Any] = None, + value_coercion_func: Optional[Converter] = None, + error_message: Optional[str] = None, +) -> Optional[Where]: """ Handles: - parsing the user input into values that are comparable to items the iterable returns @@ -278,17 +272,17 @@ def _create_range_filter( def select_range( itr: Iterator[ET], *, - where: Where | None = None, - order_key: str | None = None, - order_value: Where | None = None, - order_by_value_type: type | None = None, - unparsed_range: RangeTuple | None = None, + where: Optional[Where] = None, + order_key: Optional[str] = None, + order_value: Optional[Where] = None, + order_by_value_type: Optional[Type] = None, + unparsed_range: Optional[RangeTuple] = None, reverse: bool = False, - limit: int | None = None, + limit: Optional[int] = None, drop_unsorted: bool = False, wrap_unsorted: bool = False, warn_exceptions: bool = False, - warn_func: Callable[[Exception], None] | None = None, + warn_func: Optional[Callable[[Exception], None]] = None, drop_exceptions: bool = False, raise_exceptions: bool = False, ) -> Iterator[ET]: @@ -323,10 +317,9 @@ def select_range( drop_exceptions=drop_exceptions, raise_exceptions=raise_exceptions, warn_exceptions=warn_exceptions, - warn_func=warn_func, - ) + warn_func=warn_func) - order_by_chosen: OrderFunc | None = None + order_by_chosen: Optional[OrderFunc] = None # if the user didn't specify an attribute to order value, but specified a type # we should search for on each value in the iterator @@ -337,8 +330,6 @@ def select_range( # if the user supplied a order_key, and/or we've generated an order_value, create # the function that accesses that type on each value in the iterator if order_key is not None or order_value is not None: - # _generate_order_value_func internally here creates a copy of the iterator, which has to - # be consumed in-case we're sorting by mixed types order_by_chosen, itr = _handle_generate_order_by(itr, order_key=order_key, order_value=order_value) # signifies that itr is empty -- can early return here if order_by_chosen is None: @@ -354,7 +345,7 @@ Specify a type or a key to order the value by""") # force drop_unsorted=True so we can use _create_range_filter # sort the iterable by the generated order_by_chosen function itr = select(itr, order_by=order_by_chosen, drop_unsorted=True) - filter_func: Where | None + filter_func: Optional[Where] if order_by_value_type in [datetime, date]: filter_func = _create_range_filter( unparsed_range=unparsed_range, @@ -362,8 +353,7 @@ Specify a type or a key to order the value by""") within_parser=parse_timedelta_float, attr_func=order_by_chosen, # type: ignore[arg-type] default_before=time.time(), - value_coercion_func=_datelike_to_float, - ) + value_coercion_func=_datelike_to_float) elif order_by_value_type in [int, float]: # allow primitives to be converted using the default int(), float() callables filter_func = _create_range_filter( @@ -372,8 +362,7 @@ Specify a type or a key to order the value by""") within_parser=order_by_value_type, attr_func=order_by_chosen, # type: ignore[arg-type] default_before=None, - value_coercion_func=order_by_value_type, - ) + value_coercion_func=order_by_value_type) else: # TODO: add additional kwargs to let the user sort by other values, by specifying the parsers? # would need to allow passing the end_parser, within parser, default before and value_coercion_func... @@ -400,7 +389,7 @@ Specify a type or a key to order the value by""") return itr -# reuse items from query for testing +# re-use items from query for testing from .query import _A, _B, _Float, _mixed_iter_errors @@ -481,7 +470,7 @@ def test_range_predicate() -> None: # filter from 0 to 5 rn: RangeTuple = RangeTuple("0", "5", None) - zero_to_five_filter: Where | None = int_filter_func(unparsed_range=rn) + zero_to_five_filter: Optional[Where] = int_filter_func(unparsed_range=rn) assert zero_to_five_filter is not None # this is just a Where function, given some input it return True/False if the value is allowed assert zero_to_five_filter(3) is True @@ -494,7 +483,6 @@ def test_range_predicate() -> None: rn = RangeTuple(None, 3, "3.5") assert list(filter(int_filter_func(unparsed_range=rn, attr_func=identity), src())) == ["0", "1", "2"] - def test_parse_range() -> None: from functools import partial diff --git a/my/core/serialize.py b/my/core/serialize.py index e36da8f..ab11a20 100644 --- a/my/core/serialize.py +++ b/my/core/serialize.py @@ -1,11 +1,9 @@ -from __future__ import annotations - import datetime from dataclasses import asdict, is_dataclass from decimal import Decimal -from functools import cache +from functools import lru_cache from pathlib import Path -from typing import Any, Callable, NamedTuple +from typing import Any, Callable, NamedTuple, Optional from .error import error_to_json from .pytest import parametrize @@ -59,12 +57,12 @@ def _default_encode(obj: Any) -> Any: # could possibly run multiple times/raise warning if you provide different 'default' # functions or change the kwargs? The alternative is to maintain all of this at the module # level, which is just as annoying -@cache +@lru_cache(maxsize=None) def _dumps_factory(**kwargs) -> Callable[[Any], str]: use_default: DefaultEncoder = _default_encode # if the user passed an additional 'default' parameter, # try using that to serialize before before _default_encode - _additional_default: DefaultEncoder | None = kwargs.get("default") + _additional_default: Optional[DefaultEncoder] = kwargs.get("default") if _additional_default is not None and callable(_additional_default): def wrapped_default(obj: Any) -> Any: @@ -80,9 +78,9 @@ def _dumps_factory(**kwargs) -> Callable[[Any], str]: kwargs["default"] = use_default - prefer_factory: str | None = kwargs.pop('_prefer_factory', None) + prefer_factory: Optional[str] = kwargs.pop('_prefer_factory', None) - def orjson_factory() -> Dumps | None: + def orjson_factory() -> Optional[Dumps]: try: import orjson except ModuleNotFoundError: @@ -97,7 +95,7 @@ def _dumps_factory(**kwargs) -> Callable[[Any], str]: return _orjson_dumps - def simplejson_factory() -> Dumps | None: + def simplejson_factory() -> Optional[Dumps]: try: from simplejson import dumps as simplejson_dumps except ModuleNotFoundError: @@ -117,7 +115,7 @@ def _dumps_factory(**kwargs) -> Callable[[Any], str]: return _simplejson_dumps - def stdlib_factory() -> Dumps | None: + def stdlib_factory() -> Optional[Dumps]: import json from .warnings import high @@ -152,7 +150,7 @@ def _dumps_factory(**kwargs) -> Callable[[Any], str]: def dumps( obj: Any, - default: DefaultEncoder | None = None, + default: Optional[DefaultEncoder] = None, **kwargs, ) -> str: """ diff --git a/my/core/source.py b/my/core/source.py index a309d13..52c58c1 100644 --- a/my/core/source.py +++ b/my/core/source.py @@ -3,12 +3,9 @@ Decorator to gracefully handle importing a data source, or warning and yielding nothing (or a default) when its not available """ -from __future__ import annotations - import warnings -from collections.abc import Iterable, Iterator from functools import wraps -from typing import Any, Callable, TypeVar +from typing import Any, Callable, Iterable, Iterator, Optional, TypeVar from .warnings import medium @@ -29,8 +26,8 @@ _DEFAULT_ITR = () def import_source( *, default: Iterable[T] = _DEFAULT_ITR, - module_name: str | None = None, - help_url: str | None = None, + module_name: Optional[str] = None, + help_url: Optional[str] = None, ) -> Callable[..., Callable[..., Iterator[T]]]: """ doesn't really play well with types, but is used to catch @@ -53,7 +50,6 @@ def import_source( except (ImportError, AttributeError) as err: from . import core_config as CC from .error import warn_my_config_import_error - suppressed_in_conf = False if module_name is not None and CC.config._is_module_active(module_name) is False: suppressed_in_conf = True @@ -76,7 +72,5 @@ class core: if not matched_config_err and isinstance(err, AttributeError): raise err yield from default - return wrapper - return decorator diff --git a/my/core/sqlite.py b/my/core/sqlite.py index 6167d2e..08a80e5 100644 --- a/my/core/sqlite.py +++ b/my/core/sqlite.py @@ -1,16 +1,12 @@ -from __future__ import annotations +from .internal import assert_subpackage; assert_subpackage(__name__) -from .internal import assert_subpackage # noqa: I001 - -assert_subpackage(__name__) import shutil import sqlite3 -from collections.abc import Iterator from contextlib import contextmanager from pathlib import Path from tempfile import TemporaryDirectory -from typing import Any, Callable, Literal, Union, overload +from typing import Any, Callable, Iterator, Literal, Optional, Tuple, Union, overload from .common import PathIsh from .compat import assert_never @@ -26,7 +22,6 @@ def test_sqlite_connect_immutable(tmp_path: Path) -> None: conn.execute('CREATE TABLE testtable (col)') import pytest - with pytest.raises(sqlite3.OperationalError, match='readonly database'): with sqlite_connect_immutable(db) as conn: conn.execute('DROP TABLE testtable') @@ -38,7 +33,6 @@ def test_sqlite_connect_immutable(tmp_path: Path) -> None: SqliteRowFactory = Callable[[sqlite3.Cursor, sqlite3.Row], Any] - def dict_factory(cursor, row): fields = [column[0] for column in cursor.description] return dict(zip(fields, row)) @@ -46,9 +40,8 @@ def dict_factory(cursor, row): Factory = Union[SqliteRowFactory, Literal['row', 'dict']] - @contextmanager -def sqlite_connection(db: PathIsh, *, immutable: bool = False, row_factory: Factory | None = None) -> Iterator[sqlite3.Connection]: +def sqlite_connection(db: PathIsh, *, immutable: bool=False, row_factory: Optional[Factory]=None) -> Iterator[sqlite3.Connection]: dbp = f'file:{db}' # https://www.sqlite.org/draft/uri.html#uriimmutable if immutable: @@ -104,76 +97,31 @@ def sqlite_copy_and_open(db: PathIsh) -> sqlite3.Connection: # and then the return type ends up as Iterator[Tuple[str, ...]], which isn't desirable :( # a bit annoying to have this copy-pasting, but hopefully not a big issue -# fmt: off @overload -def select(cols: tuple[str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any ]]: ... +def select(cols: Tuple[str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any ]]: ... @overload -def select(cols: tuple[str, str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any ]]: ... +def select(cols: Tuple[str, str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any ]]: ... @overload -def select(cols: tuple[str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any, Any ]]: ... +def select(cols: Tuple[str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any, Any ]]: ... @overload -def select(cols: tuple[str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any, Any, Any ]]: ... +def select(cols: Tuple[str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any, Any, Any ]]: ... @overload -def select(cols: tuple[str, str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any, Any, Any, Any ]]: ... +def select(cols: Tuple[str, str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any, Any, Any, Any ]]: ... @overload -def select(cols: tuple[str, str, str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any, Any, Any, Any, Any ]]: ... +def select(cols: Tuple[str, str, str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any, Any, Any, Any, Any ]]: ... @overload -def select(cols: tuple[str, str, str, str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any, Any, Any, Any, Any, Any ]]: ... +def select(cols: Tuple[str, str, str, str, str, str, str ], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any, Any, Any, Any, Any, Any ]]: ... @overload -def select(cols: tuple[str, str, str, str, str, str, str, str], rest: str, *, db: sqlite3.Connection) -> \ - Iterator[tuple[Any, Any, Any, Any, Any, Any, Any, Any]]: ... -# fmt: on +def select(cols: Tuple[str, str, str, str, str, str, str, str], rest: str, *, db: sqlite3.Connection) -> \ + Iterator[Tuple[Any, Any, Any, Any, Any, Any, Any, Any]]: ... def select(cols, rest, *, db): # db arg is last cause that results in nicer code formatting.. return db.execute('SELECT ' + ','.join(cols) + ' ' + rest) - - -class SqliteTool: - def __init__(self, connection: sqlite3.Connection) -> None: - self.connection = connection - - def _get_sqlite_master(self) -> dict[str, str]: - res = {} - for c in self.connection.execute('SELECT name, type FROM sqlite_master'): - [name, type_] = c - assert type_ in {'table', 'index', 'view', 'trigger'}, (name, type_) # just in case - res[name] = type_ - return res - - def get_table_names(self) -> list[str]: - master = self._get_sqlite_master() - res = [] - for name, type_ in master.items(): - if type_ != 'table': - continue - res.append(name) - return res - - def get_table_schema(self, name: str) -> dict[str, str]: - """ - Returns map from column name to column type - - NOTE: Sometimes this doesn't work if the db has some extensions (e.g. happens for facebook apps) - In this case you might still be able to use get_table_names - """ - schema: dict[str, str] = {} - for row in self.connection.execute(f'PRAGMA table_info(`{name}`)'): - col = row[1] - type_ = row[2] - # hmm, somewhere between 3.34.1 and 3.37.2, sqlite started normalising type names to uppercase - # let's do this just in case since python < 3.10 are using the old version - # e.g. it could have returned 'blob' and that would confuse blob check (see _check_allowed_blobs) - type_ = type_.upper() - schema[col] = type_ - return schema - - def get_table_schemas(self) -> dict[str, dict[str, str]]: - return {name: self.get_table_schema(name) for name in self.get_table_names()} diff --git a/my/core/stats.py b/my/core/stats.py index a553db3..674a8d1 100644 --- a/my/core/stats.py +++ b/my/core/stats.py @@ -2,13 +2,10 @@ Helpers for hpi doctor/stats functionality. ''' -from __future__ import annotations - import collections.abc import importlib import inspect import typing -from collections.abc import Iterable, Iterator, Sequence from contextlib import contextmanager from datetime import datetime from pathlib import Path @@ -16,13 +13,20 @@ from types import ModuleType from typing import ( Any, Callable, + Dict, + Iterable, + Iterator, + List, + Optional, Protocol, + Sequence, + Union, cast, ) from .types import asdict -Stats = dict[str, Any] +Stats = Dict[str, Any] class StatsFun(Protocol): @@ -51,10 +55,10 @@ def quick_stats(): def stat( - func: Callable[[], Iterable[Any]] | Iterable[Any], + func: Union[Callable[[], Iterable[Any]], Iterable[Any]], *, quick: bool = False, - name: str | None = None, + name: Optional[str] = None, ) -> Stats: """ Extracts various statistics from a passed iterable/callable, e.g.: @@ -149,8 +153,8 @@ def test_stat() -> None: # -def get_stats(module_name: str, *, guess: bool = False) -> StatsFun | None: - stats: StatsFun | None = None +def get_stats(module_name: str, *, guess: bool = False) -> Optional[StatsFun]: + stats: Optional[StatsFun] = None try: module = importlib.import_module(module_name) except Exception: @@ -163,7 +167,7 @@ def get_stats(module_name: str, *, guess: bool = False) -> StatsFun | None: # TODO maybe could be enough to annotate OUTPUTS or something like that? # then stats could just use them as hints? -def guess_stats(module: ModuleType) -> StatsFun | None: +def guess_stats(module: ModuleType) -> Optional[StatsFun]: """ If the module doesn't have explicitly defined 'stat' function, this is used to try to guess what could be included in stats automatically @@ -202,7 +206,7 @@ def test_guess_stats() -> None: } -def _guess_data_providers(module: ModuleType) -> dict[str, Callable]: +def _guess_data_providers(module: ModuleType) -> Dict[str, Callable]: mfunctions = inspect.getmembers(module, inspect.isfunction) return {k: v for k, v in mfunctions if is_data_provider(v)} @@ -259,7 +263,7 @@ def test_is_data_provider() -> None: lam = lambda: [1, 2] assert not idp(lam) - def has_extra_args(count) -> list[int]: + def has_extra_args(count) -> List[int]: return list(range(count)) assert not idp(has_extra_args) @@ -336,10 +340,10 @@ def test_type_is_iterable() -> None: assert not fun(None) assert not fun(int) assert not fun(Any) - assert not fun(dict[int, int]) + assert not fun(Dict[int, int]) - assert fun(list[int]) - assert fun(Sequence[dict[str, str]]) + assert fun(List[int]) + assert fun(Sequence[Dict[str, str]]) assert fun(Iterable[Any]) @@ -430,7 +434,7 @@ def test_stat_iterable() -> None: # experimental, not sure about it.. -def _guess_datetime(x: Any) -> datetime | None: +def _guess_datetime(x: Any) -> Optional[datetime]: # todo hmm implement without exception.. try: d = asdict(x) diff --git a/my/core/structure.py b/my/core/structure.py index bb049e4..fa26532 100644 --- a/my/core/structure.py +++ b/my/core/structure.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import atexit import os import shutil @@ -7,9 +5,9 @@ import sys import tarfile import tempfile import zipfile -from collections.abc import Generator, Sequence from contextlib import contextmanager from pathlib import Path +from typing import Generator, List, Sequence, Tuple, Union from .logging import make_logger @@ -44,10 +42,10 @@ TARGZ_EXT = {".tar.gz"} @contextmanager def match_structure( base: Path, - expected: str | Sequence[str], + expected: Union[str, Sequence[str]], *, partial: bool = False, -) -> Generator[tuple[Path, ...], None, None]: +) -> Generator[Tuple[Path, ...], None, None]: """ Given a 'base' directory or archive (zip/tar.gz), recursively search for one or more paths that match the pattern described in 'expected'. That can be a single string, or a list @@ -142,8 +140,8 @@ def match_structure( if not searchdir.is_dir(): raise NotADirectoryError(f"Expected either a zip/tar.gz archive or a directory, received {searchdir}") - matches: list[Path] = [] - possible_targets: list[Path] = [searchdir] + matches: List[Path] = [] + possible_targets: List[Path] = [searchdir] while len(possible_targets) > 0: p = possible_targets.pop(0) @@ -174,7 +172,7 @@ def warn_leftover_files() -> None: from . import core_config as CC base_tmp: Path = CC.config.get_tmp_dir() - leftover: list[Path] = list(base_tmp.iterdir()) + leftover: List[Path] = list(base_tmp.iterdir()) if leftover: logger.debug(f"at exit warning: Found leftover files in temporary directory '{leftover}'. this may be because you have multiple hpi processes running -- if so this can be ignored") diff --git a/my/core/tests/auto_stats.py b/my/core/tests/auto_stats.py index fc49e03..d10d4c4 100644 --- a/my/core/tests/auto_stats.py +++ b/my/core/tests/auto_stats.py @@ -2,11 +2,11 @@ Helper 'module' for test_guess_stats """ -from collections.abc import Iterable, Iterator, Sequence from contextlib import contextmanager from dataclasses import dataclass from datetime import datetime, timedelta from pathlib import Path +from typing import Iterable, Iterator, Sequence @dataclass diff --git a/my/core/tests/common.py b/my/core/tests/common.py index 073ea5f..22a74d7 100644 --- a/my/core/tests/common.py +++ b/my/core/tests/common.py @@ -1,8 +1,6 @@ -from __future__ import annotations - import os -from collections.abc import Iterator from contextlib import contextmanager +from typing import Iterator, Optional import pytest @@ -17,7 +15,7 @@ skip_if_uses_optional_deps = pytest.mark.skipif( # TODO maybe move to hpi core? @contextmanager -def tmp_environ_set(key: str, value: str | None) -> Iterator[None]: +def tmp_environ_set(key: str, value: Optional[str]) -> Iterator[None]: prev_value = os.environ.get(key) if value is None: os.environ.pop(key, None) diff --git a/my/core/tests/denylist.py b/my/core/tests/denylist.py index 73c3165..2688319 100644 --- a/my/core/tests/denylist.py +++ b/my/core/tests/denylist.py @@ -1,9 +1,8 @@ import json import warnings -from collections.abc import Iterator from datetime import datetime from pathlib import Path -from typing import NamedTuple +from typing import Iterator, NamedTuple from ..denylist import DenyList diff --git a/my/core/tests/test_cachew.py b/my/core/tests/test_cachew.py index a0d2267..70ac76f 100644 --- a/my/core/tests/test_cachew.py +++ b/my/core/tests/test_cachew.py @@ -1,7 +1,7 @@ -from __future__ import annotations - from .common import skip_if_uses_optional_deps as pytestmark +from typing import List + # TODO ugh, this is very messy.. need to sort out config overriding here @@ -16,7 +16,7 @@ def test_cachew() -> None: # TODO ugh. need doublewrap or something to avoid having to pass parens @mcachew() - def cf() -> list[int]: + def cf() -> List[int]: nonlocal called called += 1 return [1, 2, 3] @@ -43,7 +43,7 @@ def test_cachew_dir_none() -> None: called = 0 @mcachew(cache_path=cache_dir() / 'ctest') - def cf() -> list[int]: + def cf() -> List[int]: nonlocal called called += 1 return [called, called, called] diff --git a/my/core/tests/test_config.py b/my/core/tests/test_config.py index f6d12ba..78d1a62 100644 --- a/my/core/tests/test_config.py +++ b/my/core/tests/test_config.py @@ -2,8 +2,8 @@ Various tests that are checking behaviour of user config wrt to various things """ -import os import sys +import os from pathlib import Path import pytest diff --git a/my/core/tests/test_tmp_config.py b/my/core/tests/test_tmp_config.py index d99621d..e5a24cc 100644 --- a/my/core/tests/test_tmp_config.py +++ b/my/core/tests/test_tmp_config.py @@ -12,7 +12,7 @@ def _init_default_config() -> None: def test_tmp_config() -> None: ## ugh. ideally this would be on the top level (would be a better test) - ## but pytest imports everything first, executes hooks, and some reset_modules() fictures mess stuff up + ## but pytest imports eveything first, executes hooks, and some reset_modules() fictures mess stuff up ## later would be nice to be a bit more careful about them _init_default_config() from my.simple import items diff --git a/my/core/time.py b/my/core/time.py index a9b180d..6de4105 100644 --- a/my/core/time.py +++ b/my/core/time.py @@ -1,7 +1,5 @@ -from __future__ import annotations - -from collections.abc import Sequence -from functools import cache, lru_cache +from functools import lru_cache +from typing import Dict, Sequence import pytz @@ -13,24 +11,23 @@ def user_forced() -> Sequence[str]: # https://stackoverflow.com/questions/36067621/python-all-possible-timezone-abbreviations-for-given-timezone-name-and-vise-ve try: from my.config import time as user_config - - return user_config.tz.force_abbreviations # type: ignore[attr-defined] # noqa: TRY300 - # note: noqa since we're catching case where config doesn't have attribute here as well except: # todo log/apply policy return [] + else: + return user_config.tz.force_abbreviations # type: ignore[attr-defined] @lru_cache(1) -def _abbr_to_timezone_map() -> dict[str, pytz.BaseTzInfo]: +def _abbr_to_timezone_map() -> Dict[str, pytz.BaseTzInfo]: # also force UTC to always correspond to utc # this makes more sense than Zulu it ends up by default timezones = [*pytz.all_timezones, 'UTC', *user_forced()] - res: dict[str, pytz.BaseTzInfo] = {} + res: Dict[str, pytz.BaseTzInfo] = {} for tzname in timezones: tz = pytz.timezone(tzname) - infos = getattr(tz, '_tzinfos', []) # not sure if can rely on attr always present? + infos = getattr(tz, '_tzinfos', []) # not sure if can rely on attr always present? for info in infos: abbr = info[-1] # todo could support this with a better error handling strategy? @@ -46,7 +43,7 @@ def _abbr_to_timezone_map() -> dict[str, pytz.BaseTzInfo]: return res -@cache +@lru_cache(maxsize=None) def abbr_to_timezone(abbr: str) -> pytz.BaseTzInfo: return _abbr_to_timezone_map()[abbr] diff --git a/my/core/types.py b/my/core/types.py index dc19c19..b1cf103 100644 --- a/my/core/types.py +++ b/my/core/types.py @@ -1,15 +1,14 @@ -from __future__ import annotations - -from .internal import assert_subpackage - -assert_subpackage(__name__) +from .internal import assert_subpackage; assert_subpackage(__name__) from dataclasses import asdict as dataclasses_asdict from dataclasses import is_dataclass from datetime import datetime -from typing import Any +from typing import ( + Any, + Dict, +) -Json = dict[str, Any] +Json = Dict[str, Any] # for now just serves documentation purposes... but one day might make it statically verifiable where possible? diff --git a/my/core/util.py b/my/core/util.py index 74e71e1..a247f81 100644 --- a/my/core/util.py +++ b/my/core/util.py @@ -1,12 +1,10 @@ -from __future__ import annotations - import os import pkgutil import sys -from collections.abc import Iterable from itertools import chain from pathlib import Path from types import ModuleType +from typing import Iterable, List, Optional from .discovery_pure import HPIModule, _is_not_module_src, has_stats, ignored @@ -22,14 +20,13 @@ from .discovery_pure import NOT_HPI_MODULE_VAR assert NOT_HPI_MODULE_VAR in globals() # check name consistency - -def is_not_hpi_module(module: str) -> str | None: +def is_not_hpi_module(module: str) -> Optional[str]: ''' None if a module, otherwise returns reason ''' import importlib.util - path: str | None = None + path: Optional[str] = None try: # TODO annoying, this can cause import of the parent module? spec = importlib.util.find_spec(module) @@ -38,7 +35,7 @@ def is_not_hpi_module(module: str) -> str | None: except Exception as e: # todo a bit misleading.. it actually shouldn't import in most cases, it's just the weird parent module import thing return "import error (possibly missing config entry)" # todo add exc message? - assert path is not None # not sure if can happen? + assert path is not None # not sure if can happen? if _is_not_module_src(Path(path)): return f"marked explicitly (via {NOT_HPI_MODULE_VAR})" @@ -60,10 +57,9 @@ def _iter_all_importables(pkg: ModuleType) -> Iterable[HPIModule]: def _discover_path_importables(pkg_pth: Path, pkg_name: str) -> Iterable[HPIModule]: + from .core_config import config + """Yield all importables under a given path and package.""" - - from .core_config import config # noqa: F401 - for dir_path, dirs, file_names in os.walk(pkg_pth): file_names.sort() # NOTE: sorting dirs in place is intended, it's the way you're supposed to do it with os.walk @@ -86,7 +82,6 @@ def _discover_path_importables(pkg_pth: Path, pkg_name: str) -> Iterable[HPIModu # TODO might need to make it defensive and yield Exception (otherwise hpi doctor might fail for no good reason) # use onerror=? - # ignored explicitly -> not HPI # if enabled in config -> HPI # if disabled in config -> HPI @@ -95,7 +90,7 @@ def _discover_path_importables(pkg_pth: Path, pkg_name: str) -> Iterable[HPIModu # TODO when do we need to recurse? -def _walk_packages(path: Iterable[str], prefix: str = '', onerror=None) -> Iterable[HPIModule]: +def _walk_packages(path: Iterable[str], prefix: str='', onerror=None) -> Iterable[HPIModule]: """ Modified version of https://github.com/python/cpython/blob/d50a0700265536a20bcce3fb108c954746d97625/Lib/pkgutil.py#L53, to avoid importing modules that are skipped @@ -158,9 +153,8 @@ def _walk_packages(path: Iterable[str], prefix: str = '', onerror=None) -> Itera path = [p for p in path if not seen(p)] yield from _walk_packages(path, mname + '.', onerror) - # deprecate? -def get_modules() -> list[HPIModule]: +def get_modules() -> List[HPIModule]: return list(modules()) @@ -175,14 +169,14 @@ def test_module_detection() -> None: with reset() as cc: cc.disabled_modules = ['my.location.*', 'my.body.*', 'my.workouts.*', 'my.private.*'] mods = {m.name: m for m in modules()} - assert mods['my.demo'].skip_reason == "has no 'stats()' function" + assert mods['my.demo'] .skip_reason == "has no 'stats()' function" with reset() as cc: cc.disabled_modules = ['my.location.*', 'my.body.*', 'my.workouts.*', 'my.private.*', 'my.lastfm'] - cc.enabled_modules = ['my.demo'] + cc.enabled_modules = ['my.demo'] mods = {m.name: m for m in modules()} - assert mods['my.demo'].skip_reason is None # not skipped + assert mods['my.demo'] .skip_reason is None # not skipped assert mods['my.lastfm'].skip_reason == "suppressed in the user config" diff --git a/my/core/utils/concurrent.py b/my/core/utils/concurrent.py index 515c3f1..146861b 100644 --- a/my/core/utils/concurrent.py +++ b/my/core/utils/concurrent.py @@ -1,7 +1,6 @@ -from __future__ import annotations - +import sys from concurrent.futures import Executor, Future -from typing import Any, Callable, TypeVar +from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar from ..compat import ParamSpec @@ -16,25 +15,37 @@ class DummyExecutor(Executor): but also want to provide an option to run the code serially (e.g. for debugging) """ - def __init__(self, max_workers: int | None = 1) -> None: + def __init__(self, max_workers: Optional[int] = 1) -> None: self._shutdown = False self._max_workers = max_workers - def submit(self, fn: Callable[_P, _T], /, *args: _P.args, **kwargs: _P.kwargs) -> Future[_T]: - if self._shutdown: - raise RuntimeError('cannot schedule new futures after shutdown') + if TYPE_CHECKING: + if sys.version_info[:2] <= (3, 8): + # 3.8 doesn't support ParamSpec as Callable arg :( + # and any attempt to type results in incompatible supertype.. so whatever + def submit(self, fn, *args, **kwargs): ... - f: Future[Any] = Future() - try: - result = fn(*args, **kwargs) - except KeyboardInterrupt: - raise - except BaseException as e: - f.set_exception(e) else: - f.set_result(result) - return f + def submit(self, fn: Callable[_P, _T], /, *args: _P.args, **kwargs: _P.kwargs) -> Future[_T]: ... + + else: + + def submit(self, fn, *args, **kwargs): + if self._shutdown: + raise RuntimeError('cannot schedule new futures after shutdown') + + f: Future[Any] = Future() + try: + result = fn(*args, **kwargs) + except KeyboardInterrupt: + raise + except BaseException as e: + f.set_exception(e) + else: + f.set_result(result) + + return f def shutdown(self, wait: bool = True, **kwargs) -> None: # noqa: FBT001,FBT002,ARG002 self._shutdown = True diff --git a/my/core/utils/imports.py b/my/core/utils/imports.py index e0fb01d..4666a5e 100644 --- a/my/core/utils/imports.py +++ b/my/core/utils/imports.py @@ -1,27 +1,27 @@ -from __future__ import annotations - import importlib import importlib.util import sys from pathlib import Path from types import ModuleType +from typing import Optional + +from ..common import PathIsh # TODO only used in tests? not sure if useful at all. -def import_file(p: Path | str, name: str | None = None) -> ModuleType: +def import_file(p: PathIsh, name: Optional[str] = None) -> ModuleType: p = Path(p) if name is None: name = p.stem spec = importlib.util.spec_from_file_location(name, p) assert spec is not None, f"Fatal error; Could not create module spec from {name} {p}" foo = importlib.util.module_from_spec(spec) - loader = spec.loader - assert loader is not None + loader = spec.loader; assert loader is not None loader.exec_module(foo) return foo -def import_from(path: Path | str, name: str) -> ModuleType: +def import_from(path: PathIsh, name: str) -> ModuleType: path = str(path) sys.path.append(path) try: @@ -30,7 +30,7 @@ def import_from(path: Path | str, name: str) -> ModuleType: sys.path.remove(path) -def import_dir(path: Path | str, extra: str = '') -> ModuleType: +def import_dir(path: PathIsh, extra: str = '') -> ModuleType: p = Path(path) if p.parts[0] == '~': p = p.expanduser() # TODO eh. not sure about this.. diff --git a/my/core/utils/itertools.py b/my/core/utils/itertools.py index 42b2b77..ae9402d 100644 --- a/my/core/utils/itertools.py +++ b/my/core/utils/itertools.py @@ -4,13 +4,17 @@ Various helpers/transforms of iterators Ideally this should be as small as possible and we should rely on stdlib itertools or more_itertools """ -from __future__ import annotations - import warnings -from collections.abc import Hashable, Iterable, Iterator, Sized +from collections.abc import Hashable from typing import ( TYPE_CHECKING, Callable, + Dict, + Iterable, + Iterator, + List, + Optional, + Sized, TypeVar, Union, cast, @@ -19,8 +23,9 @@ from typing import ( import more_itertools from decorator import decorator -from .. import warnings as core_warnings from ..compat import ParamSpec +from .. import warnings as core_warnings + T = TypeVar('T') K = TypeVar('K') @@ -34,7 +39,7 @@ def _identity(v: T) -> V: # type: ignore[type-var] # ugh. nothing in more_itertools? # perhaps duplicates_everseen? but it doesn't yield non-unique elements? def ensure_unique(it: Iterable[T], *, key: Callable[[T], K]) -> Iterable[T]: - key2item: dict[K, T] = {} + key2item: Dict[K, T] = {} for i in it: k = key(i) pi = key2item.get(k, None) @@ -67,10 +72,10 @@ def make_dict( key: Callable[[T], K], # TODO make value optional instead? but then will need a typing override for it? value: Callable[[T], V] = _identity, -) -> dict[K, V]: +) -> Dict[K, V]: with_keys = ((key(i), i) for i in it) uniques = ensure_unique(with_keys, key=lambda p: p[0]) - res: dict[K, V] = {} + res: Dict[K, V] = {} for k, i in uniques: res[k] = i if value is None else value(i) return res @@ -88,8 +93,8 @@ def test_make_dict() -> None: d = make_dict(it, key=lambda i: i % 2, value=lambda i: i) # check type inference - d2: dict[str, int] = make_dict(it, key=lambda i: str(i)) - d3: dict[str, bool] = make_dict(it, key=lambda i: str(i), value=lambda i: i % 2 == 0) + d2: Dict[str, int] = make_dict(it, key=lambda i: str(i)) + d3: Dict[str, bool] = make_dict(it, key=lambda i: str(i), value=lambda i: i % 2 == 0) LFP = ParamSpec('LFP') @@ -97,7 +102,7 @@ LV = TypeVar('LV') @decorator -def _listify(func: Callable[LFP, Iterable[LV]], *args: LFP.args, **kwargs: LFP.kwargs) -> list[LV]: +def _listify(func: Callable[LFP, Iterable[LV]], *args: LFP.args, **kwargs: LFP.kwargs) -> List[LV]: """ Wraps a function's return value in wrapper (e.g. list) Useful when an algorithm can be expressed more cleanly as a generator @@ -110,7 +115,7 @@ def _listify(func: Callable[LFP, Iterable[LV]], *args: LFP.args, **kwargs: LFP.k # so seems easiest to just use specialize instantiations of decorator instead if TYPE_CHECKING: - def listify(func: Callable[LFP, Iterable[LV]]) -> Callable[LFP, list[LV]]: ... # noqa: ARG001 + def listify(func: Callable[LFP, Iterable[LV]]) -> Callable[LFP, List[LV]]: ... # noqa: ARG001 else: listify = _listify @@ -125,7 +130,7 @@ def test_listify() -> None: yield 2 res = it() - assert_type(res, list[int]) + assert_type(res, List[int]) assert res == [1, 2] @@ -196,24 +201,24 @@ def test_warn_if_empty_list() -> None: ll = [1, 2, 3] @warn_if_empty - def nonempty() -> list[int]: + def nonempty() -> List[int]: return ll with warnings.catch_warnings(record=True) as w: res1 = nonempty() assert len(w) == 0 - assert_type(res1, list[int]) + assert_type(res1, List[int]) assert isinstance(res1, list) assert res1 is ll # object should be unchanged! @warn_if_empty - def empty() -> list[str]: + def empty() -> List[str]: return [] with warnings.catch_warnings(record=True) as w: res2 = empty() assert len(w) == 1 - assert_type(res2, list[str]) + assert_type(res2, List[str]) assert isinstance(res2, list) assert res2 == [] @@ -237,7 +242,7 @@ def check_if_hashable(iterable: Iterable[_HT]) -> Iterable[_HT]: """ NOTE: Despite Hashable bound, typing annotation doesn't guarantee runtime safety Consider hashable type X, and Y that inherits from X, but not hashable - Then l: list[X] = [Y(...)] is a valid expression, and type checks against Hashable, + Then l: List[X] = [Y(...)] is a valid expression, and type checks against Hashable, but isn't runtime hashable """ # Sadly this doesn't work 100% correctly with dataclasses atm... @@ -263,27 +268,28 @@ def check_if_hashable(iterable: Iterable[_HT]) -> Iterable[_HT]: # TODO different policies -- error/warn/ignore? def test_check_if_hashable() -> None: from dataclasses import dataclass + from typing import Set, Tuple import pytest from ..compat import assert_type - x1: list[int] = [1, 2] + x1: List[int] = [1, 2] r1 = check_if_hashable(x1) assert_type(r1, Iterable[int]) assert r1 is x1 - x2: Iterator[int | str] = iter((123, 'aba')) + x2: Iterator[Union[int, str]] = iter((123, 'aba')) r2 = check_if_hashable(x2) assert_type(r2, Iterable[Union[int, str]]) assert list(r2) == [123, 'aba'] - x3: tuple[object, ...] = (789, 'aba') + x3: Tuple[object, ...] = (789, 'aba') r3 = check_if_hashable(x3) assert_type(r3, Iterable[object]) assert r3 is x3 # object should be unchanged - x4: list[set[int]] = [{1, 2, 3}, {4, 5, 6}] + x4: List[Set[int]] = [{1, 2, 3}, {4, 5, 6}] with pytest.raises(Exception): # should be rejected by mypy sice set isn't Hashable, but also throw at runtime r4 = check_if_hashable(x4) # type: ignore[type-var] @@ -301,7 +307,7 @@ def test_check_if_hashable() -> None: class X: a: int - x6: list[X] = [X(a=123)] + x6: List[X] = [X(a=123)] r6 = check_if_hashable(x6) assert x6 is r6 @@ -310,7 +316,7 @@ def test_check_if_hashable() -> None: class Y(X): b: str - x7: list[Y] = [Y(a=123, b='aba')] + x7: List[Y] = [Y(a=123, b='aba')] with pytest.raises(Exception): # ideally that would also be rejected by mypy, but currently there is a bug # which treats all dataclasses as hashable: https://github.com/python/mypy/issues/11463 @@ -321,12 +327,15 @@ _UET = TypeVar('_UET') _UEU = TypeVar('_UEU') -# NOTE: for historic reasons, this function had to accept Callable that returns iterator +# NOTE: for historic reasons, this function had to accept Callable that retuns iterator # instead of just iterator # TODO maybe deprecated Callable support? not sure def unique_everseen( - fun: Callable[[], Iterable[_UET]] | Iterable[_UET], - key: Callable[[_UET], _UEU] | None = None, + fun: Union[ + Callable[[], Iterable[_UET]], + Iterable[_UET] + ], + key: Optional[Callable[[_UET], _UEU]] = None, ) -> Iterator[_UET]: import os @@ -358,7 +367,7 @@ def test_unique_everseen() -> None: assert list(unique_everseen(fun_good)) == [123] with pytest.raises(Exception): - # since function returns a list rather than iterator, check happens immediately + # since function retuns a list rather than iterator, check happens immediately # , even without advancing the iterator unique_everseen(fun_bad) diff --git a/my/core/warnings.py b/my/core/warnings.py index d67ec7d..2ffc3e4 100644 --- a/my/core/warnings.py +++ b/my/core/warnings.py @@ -5,16 +5,14 @@ since who looks at the terminal output? E.g. would be nice to propagate the warnings in the UI (it's even a subclass of Exception!) ''' -from __future__ import annotations - import sys import warnings -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Optional import click -def _colorize(x: str, color: str | None = None) -> str: +def _colorize(x: str, color: Optional[str] = None) -> str: if color is None: return x @@ -26,7 +24,7 @@ def _colorize(x: str, color: str | None = None) -> str: return click.style(x, fg=color) -def _warn(message: str, *args, color: str | None = None, **kwargs) -> None: +def _warn(message: str, *args, color: Optional[str] = None, **kwargs) -> None: stacklevel = kwargs.get('stacklevel', 1) kwargs['stacklevel'] = stacklevel + 2 # +1 for this function, +1 for medium/high wrapper warnings.warn(_colorize(message, color=color), *args, **kwargs) # noqa: B028 diff --git a/my/demo.py b/my/demo.py index fa80b2a..0c54792 100644 --- a/my/demo.py +++ b/my/demo.py @@ -1,14 +1,12 @@ ''' Just a demo module for testing and documentation purposes ''' -from __future__ import annotations import json -from collections.abc import Iterable, Sequence from dataclasses import dataclass from datetime import datetime, timezone, tzinfo from pathlib import Path -from typing import Protocol +from typing import Iterable, Optional, Protocol, Sequence from my.core import Json, PathIsh, Paths, get_files @@ -22,7 +20,7 @@ class config(Protocol): # this is to check optional attribute handling timezone: tzinfo = timezone.utc - external: PathIsh | None = None + external: Optional[PathIsh] = None @property def external_module(self): diff --git a/my/emfit/__init__.py b/my/emfit/__init__.py index 0d50b06..9934903 100644 --- a/my/emfit/__init__.py +++ b/my/emfit/__init__.py @@ -4,33 +4,30 @@ Consumes data exported by https://github.com/karlicoss/emfitexport """ -from __future__ import annotations - REQUIRES = [ 'git+https://github.com/karlicoss/emfitexport', ] -import dataclasses -import inspect -from collections.abc import Iterable, Iterator from contextlib import contextmanager +import dataclasses from datetime import datetime, time, timedelta +import inspect from pathlib import Path -from typing import Any - -import emfitexport.dal as dal +from typing import Any, Dict, Iterable, Iterator, List, Optional from my.core import ( - Res, - Stats, get_files, stat, + Res, + Stats, ) from my.core.cachew import cache_dir, mcachew -from my.core.error import extract_error_datetime, set_error_datetime +from my.core.error import set_error_datetime, extract_error_datetime from my.core.pandas import DataFrameT -from my.config import emfit as config # isort: skip +from my.config import emfit as config + +import emfitexport.dal as dal Emfit = dal.Emfit @@ -88,7 +85,7 @@ def datas() -> Iterable[Res[Emfit]]: # TODO should be used for jawbone data as well? def pre_dataframe() -> Iterable[Res[Emfit]]: # TODO shit. I need some sort of interrupted sleep detection? - g: list[Emfit] = [] + g: List[Emfit] = [] def flush() -> Iterable[Res[Emfit]]: if len(g) == 0: @@ -115,10 +112,10 @@ def pre_dataframe() -> Iterable[Res[Emfit]]: def dataframe() -> DataFrameT: - dicts: list[dict[str, Any]] = [] - last: Emfit | None = None + dicts: List[Dict[str, Any]] = [] + last: Optional[Emfit] = None for s in pre_dataframe(): - d: dict[str, Any] + d: Dict[str, Any] if isinstance(s, Exception): edt = extract_error_datetime(s) d = { @@ -169,12 +166,11 @@ def stats() -> Stats: @contextmanager def fake_data(nights: int = 500) -> Iterator: + from my.core.cfg import tmp_config from tempfile import TemporaryDirectory import pytz - from my.core.cfg import tmp_config - with TemporaryDirectory() as td: tdir = Path(td) gen = dal.FakeData() @@ -191,7 +187,7 @@ def fake_data(nights: int = 500) -> Iterator: # TODO remove/deprecate it? I think used by timeline -def get_datas() -> list[Emfit]: +def get_datas() -> List[Emfit]: # todo ugh. run lint properly return sorted(datas(), key=lambda e: e.start) # type: ignore diff --git a/my/endomondo.py b/my/endomondo.py index 7732c00..293a542 100644 --- a/my/endomondo.py +++ b/my/endomondo.py @@ -7,14 +7,13 @@ REQUIRES = [ ] # todo use ast in setup.py or doctor to extract the corresponding pip packages? -from collections.abc import Iterable, Sequence from dataclasses import dataclass from pathlib import Path - -from my.config import endomondo as user_config +from typing import Sequence, Iterable from .core import Paths, get_files +from my.config import endomondo as user_config @dataclass class endomondo(user_config): @@ -34,17 +33,15 @@ def inputs() -> Sequence[Path]: import endoexport.dal as dal from endoexport.dal import Point, Workout # noqa: F401 + from .core import Res - - # todo cachew? def workouts() -> Iterable[Res[Workout]]: _dal = dal.DAL(inputs()) yield from _dal.workouts() -from .core.pandas import DataFrameT, check_dataframe - +from .core.pandas import check_dataframe, DataFrameT @check_dataframe def dataframe(*, defensive: bool=True) -> DataFrameT: @@ -78,9 +75,7 @@ def dataframe(*, defensive: bool=True) -> DataFrameT: return df -from .core import Stats, stat - - +from .core import stat, Stats def stats() -> Stats: return { # todo pretty print stats? @@ -91,16 +86,13 @@ def stats() -> Stats: # TODO make sure it's possible to 'advise' functions and override stuff -from collections.abc import Iterator from contextlib import contextmanager - - +from typing import Iterator @contextmanager def fake_data(count: int=100) -> Iterator: - import json - from tempfile import TemporaryDirectory - from my.core.cfg import tmp_config + from tempfile import TemporaryDirectory + import json with TemporaryDirectory() as td: tdir = Path(td) fd = dal.FakeData() diff --git a/my/error.py b/my/error.py index e3c1e11..c0b734c 100644 --- a/my/error.py +++ b/my/error.py @@ -1,6 +1,6 @@ from .core.warnings import high - high("DEPRECATED! Please use my.core.error instead.") from .core import __NOT_HPI_MODULE__ + from .core.error import * diff --git a/my/experimental/destructive_parsing.py b/my/experimental/destructive_parsing.py index 0c4092a..b389f7e 100644 --- a/my/experimental/destructive_parsing.py +++ b/my/experimental/destructive_parsing.py @@ -1,6 +1,5 @@ -from collections.abc import Iterator from dataclasses import dataclass -from typing import Any +from typing import Any, Iterator, List, Tuple from my.core.compat import NoneType, assert_never @@ -10,7 +9,7 @@ from my.core.compat import NoneType, assert_never class Helper: manager: 'Manager' item: Any # todo realistically, list or dict? could at least type as indexable or something - path: tuple[str, ...] + path: Tuple[str, ...] def pop_if_primitive(self, *keys: str) -> None: """ @@ -41,9 +40,9 @@ def is_empty(x) -> bool: class Manager: def __init__(self) -> None: - self.helpers: list[Helper] = [] + self.helpers: List[Helper] = [] - def helper(self, item: Any, *, path: tuple[str, ...] = ()) -> Helper: + def helper(self, item: Any, *, path: Tuple[str, ...] = ()) -> Helper: res = Helper(manager=self, item=item, path=path) self.helpers.append(res) return res diff --git a/my/fbmessenger/__init__.py b/my/fbmessenger/__init__.py index e5e417c..40fb235 100644 --- a/my/fbmessenger/__init__.py +++ b/my/fbmessenger/__init__.py @@ -9,7 +9,7 @@ since that allows for easier overriding using namespace packages See https://github.com/karlicoss/HPI/blob/master/doc/MODULE_DESIGN.org#allpy for more info. """ -# prevent it from appearing in modules list/doctor +# prevent it from apprearing in modules list/doctor from ..core import __NOT_HPI_MODULE__ # kinda annoying to keep it, but it's so legacy 'hpi module install my.fbmessenger' works @@ -20,7 +20,6 @@ REQUIRES = [ from my.core.hpi_compat import handle_legacy_import - is_legacy_import = handle_legacy_import( parent_module_name=__name__, legacy_submodule_name='export', diff --git a/my/fbmessenger/all.py b/my/fbmessenger/all.py index a057dca..13689db 100644 --- a/my/fbmessenger/all.py +++ b/my/fbmessenger/all.py @@ -1,10 +1,10 @@ -from collections.abc import Iterator - -from my.core import Res, Stats +from typing import Iterator +from my.core import Res, stat, Stats from my.core.source import import_source from .common import Message, _merge_messages + src_export = import_source(module_name='my.fbmessenger.export') src_android = import_source(module_name='my.fbmessenger.android') diff --git a/my/fbmessenger/android.py b/my/fbmessenger/android.py index f6fdb82..effabab 100644 --- a/my/fbmessenger/android.py +++ b/my/fbmessenger/android.py @@ -4,20 +4,19 @@ Messenger data from Android app database (in =/data/data/com.facebook.orca/datab from __future__ import annotations -import sqlite3 -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path -from typing import Union +import sqlite3 +from typing import Iterator, Sequence, Optional, Dict, Union, List -from my.core import LazyLogger, Paths, Res, datetime_aware, get_files, make_config +from my.core import get_files, Paths, datetime_aware, Res, LazyLogger, make_config from my.core.common import unique_everseen from my.core.compat import assert_never from my.core.error import echain -from my.core.sqlite import sqlite_connection, SqliteTool +from my.core.sqlite import sqlite_connection -from my.config import fbmessenger as user_config # isort: skip +from my.config import fbmessenger as user_config logger = LazyLogger(__name__) @@ -28,7 +27,7 @@ class Config(user_config.android): # paths[s]/glob to the exported sqlite databases export_path: Paths - facebook_id: str | None = None + facebook_id: Optional[str] = None # hmm. this is necessary for default value (= None) to work @@ -43,13 +42,13 @@ def inputs() -> Sequence[Path]: @dataclass(unsafe_hash=True) class Sender: id: str - name: str | None + name: Optional[str] @dataclass(unsafe_hash=True) class Thread: id: str - name: str | None # isn't set for groups or one to one messages + name: Optional[str] # isn't set for groups or one to one messages # todo not sure about order of fields... @@ -57,14 +56,14 @@ class Thread: class _BaseMessage: id: str dt: datetime_aware - text: str | None + text: Optional[str] @dataclass(unsafe_hash=True) class _Message(_BaseMessage): thread_id: str sender_id: str - reply_to_id: str | None + reply_to_id: Optional[str] # todo hmm, on the one hand would be kinda nice to inherit common.Message protocol here @@ -73,7 +72,7 @@ class _Message(_BaseMessage): class Message(_BaseMessage): thread: Thread sender: Sender - reply_to: Message | None + reply_to: Optional[Message] Entity = Union[Sender, Thread, _Message] @@ -86,8 +85,8 @@ def _entities() -> Iterator[Res[Entity]]: for idx, path in enumerate(paths): logger.info(f'processing [{idx:>{width}}/{total:>{width}}] {path}') with sqlite_connection(path, immutable=True, row_factory='row') as db: - use_msys = "logging_events_v2" in SqliteTool(db).get_table_names() try: + use_msys = len(list(db.execute('SELECT * FROM sqlite_master WHERE name = "logging_events_v2"'))) > 0 if use_msys: yield from _process_db_msys(db) else: @@ -111,7 +110,7 @@ def _normalise_thread_id(key) -> str: # NOTE: this is sort of copy pasted from other _process_db method # maybe later could unify them def _process_db_msys(db: sqlite3.Connection) -> Iterator[Res[Entity]]: - senders: dict[str, Sender] = {} + senders: Dict[str, Sender] = {} for r in db.execute('SELECT CAST(id AS TEXT) AS id, name FROM contacts'): s = Sender( id=r['id'], # looks like it's server id? same used on facebook site @@ -128,7 +127,7 @@ def _process_db_msys(db: sqlite3.Connection) -> Iterator[Res[Entity]]: # TODO can we get it from db? could infer as the most common id perhaps? self_id = config.facebook_id - thread_users: dict[str, list[Sender]] = {} + thread_users: Dict[str, List[Sender]] = {} for r in db.execute('SELECT CAST(thread_key AS TEXT) AS thread_key, CAST(contact_id AS TEXT) AS contact_id FROM participants'): thread_key = r['thread_key'] user_key = r['contact_id'] @@ -174,7 +173,7 @@ def _process_db_msys(db: sqlite3.Connection) -> Iterator[Res[Entity]]: However seems that when message is not sent yet it doesn't have this server id yet (happened only once, but could be just luck of course!) We exclude these messages to avoid duplication. - However poisitive filter (e.g. message_id LIKE 'mid%') feels a bit wrong, e.g. what if message ids change or something + However poisitive filter (e.g. message_id LIKE 'mid%') feels a bit wrong, e.g. what if mesage ids change or something So instead this excludes only such unsent messages. */ message_id != offline_threading_id @@ -194,7 +193,7 @@ def _process_db_msys(db: sqlite3.Connection) -> Iterator[Res[Entity]]: def _process_db_threads_db2(db: sqlite3.Connection) -> Iterator[Res[Entity]]: - senders: dict[str, Sender] = {} + senders: Dict[str, Sender] = {} for r in db.execute('''SELECT * FROM thread_users'''): # for messaging_actor_type == 'REDUCED_MESSAGING_ACTOR', name is None # but they are still referenced, so need to keep @@ -208,7 +207,7 @@ def _process_db_threads_db2(db: sqlite3.Connection) -> Iterator[Res[Entity]]: yield s self_id = config.facebook_id - thread_users: dict[str, list[Sender]] = {} + thread_users: Dict[str, List[Sender]] = {} for r in db.execute('SELECT * from thread_participants'): thread_key = r['thread_key'] user_key = r['user_key'] @@ -268,9 +267,9 @@ def contacts() -> Iterator[Res[Sender]]: def messages() -> Iterator[Res[Message]]: - senders: dict[str, Sender] = {} - msgs: dict[str, Message] = {} - threads: dict[str, Thread] = {} + senders: Dict[str, Sender] = {} + msgs: Dict[str, Message] = {} + threads: Dict[str, Thread] = {} for x in unique_everseen(_entities): if isinstance(x, Exception): yield x diff --git a/my/fbmessenger/common.py b/my/fbmessenger/common.py index 0f5a374..33d1b20 100644 --- a/my/fbmessenger/common.py +++ b/my/fbmessenger/common.py @@ -1,9 +1,6 @@ -from __future__ import annotations +from my.core import __NOT_HPI_MODULE__ -from my.core import __NOT_HPI_MODULE__ # isort: skip - -from collections.abc import Iterator -from typing import Protocol +from typing import Iterator, Optional, Protocol from my.core import datetime_aware @@ -13,7 +10,7 @@ class Thread(Protocol): def id(self) -> str: ... @property - def name(self) -> str | None: ... + def name(self) -> Optional[str]: ... class Sender(Protocol): @@ -21,7 +18,7 @@ class Sender(Protocol): def id(self) -> str: ... @property - def name(self) -> str | None: ... + def name(self) -> Optional[str]: ... class Message(Protocol): @@ -32,7 +29,7 @@ class Message(Protocol): def dt(self) -> datetime_aware: ... @property - def text(self) -> str | None: ... + def text(self) -> Optional[str]: ... @property def thread(self) -> Thread: ... @@ -42,11 +39,8 @@ class Message(Protocol): from itertools import chain - from more_itertools import unique_everseen - -from my.core import Res, warn_if_empty - +from my.core import warn_if_empty, Res @warn_if_empty def _merge_messages(*sources: Iterator[Res[Message]]) -> Iterator[Res[Message]]: diff --git a/my/fbmessenger/export.py b/my/fbmessenger/export.py index 3b06618..201fad8 100644 --- a/my/fbmessenger/export.py +++ b/my/fbmessenger/export.py @@ -7,15 +7,16 @@ REQUIRES = [ 'git+https://github.com/karlicoss/fbmessengerexport', ] -from collections.abc import Iterator from contextlib import ExitStack, contextmanager from dataclasses import dataclass +from typing import Iterator + +from my.core import PathIsh, Res, stat, Stats +from my.core.warnings import high +from my.config import fbmessenger as user_config import fbmessengerexport.dal as messenger -from my.config import fbmessenger as user_config -from my.core import PathIsh, Res, Stats, stat -from my.core.warnings import high ### # support old style config diff --git a/my/foursquare.py b/my/foursquare.py index 3b418aa..394fdf3 100644 --- a/my/foursquare.py +++ b/my/foursquare.py @@ -2,14 +2,15 @@ Foursquare/Swarm checkins ''' -import json -from datetime import datetime, timedelta, timezone +from datetime import datetime, timezone, timedelta from itertools import chain - -from my.config import foursquare as config +import json # TODO pytz for timezone??? + from my.core import get_files, make_logger +from my.config import foursquare as config + logger = make_logger(__name__) diff --git a/my/github/all.py b/my/github/all.py index f5e13cf..f885dde 100644 --- a/my/github/all.py +++ b/my/github/all.py @@ -3,7 +3,8 @@ Unified Github data (merged from GDPR export and periodic API updates) """ from . import gdpr, ghexport -from .common import Results, merge_events + +from .common import merge_events, Results def events() -> Results: diff --git a/my/github/common.py b/my/github/common.py index 22ba47e..e54bc4d 100644 --- a/my/github/common.py +++ b/my/github/common.py @@ -1,27 +1,24 @@ """ Github events and their metadata: comments/issues/pull requests """ - -from __future__ import annotations - -from my.core import __NOT_HPI_MODULE__ # isort: skip +from ..core import __NOT_HPI_MODULE__ -from collections.abc import Iterable from datetime import datetime, timezone -from typing import NamedTuple, Optional +from typing import Optional, NamedTuple, Iterable, Set, Tuple -from my.core import make_logger, warn_if_empty -from my.core.error import Res +from ..core import warn_if_empty, LazyLogger +from ..core.error import Res -logger = make_logger(__name__) + +logger = LazyLogger(__name__) class Event(NamedTuple): dt: datetime summary: str eid: str link: Optional[str] - body: Optional[str] = None + body: Optional[str]=None is_bot: bool = False @@ -30,7 +27,7 @@ Results = Iterable[Res[Event]] @warn_if_empty def merge_events(*sources: Results) -> Results: from itertools import chain - emitted: set[tuple[datetime, str]] = set() + emitted: Set[Tuple[datetime, str]] = set() for e in chain(*sources): if isinstance(e, Exception): yield e @@ -55,7 +52,7 @@ def parse_dt(s: str) -> datetime: # experimental way of supportint event ids... not sure class EventIds: @staticmethod - def repo_created(*, dts: str, name: str, ref_type: str, ref: str | None) -> str: + def repo_created(*, dts: str, name: str, ref_type: str, ref: Optional[str]) -> str: return f'{dts}_repocreated_{name}_{ref_type}_{ref}' @staticmethod diff --git a/my/github/gdpr.py b/my/github/gdpr.py index be56454..a56ff46 100644 --- a/my/github/gdpr.py +++ b/my/github/gdpr.py @@ -6,9 +6,8 @@ from __future__ import annotations import json from abc import abstractmethod -from collections.abc import Iterator, Sequence from pathlib import Path -from typing import Any +from typing import Any, Iterator, Sequence from my.core import Paths, Res, Stats, get_files, make_logger, stat, warnings from my.core.error import echain diff --git a/my/github/ghexport.py b/my/github/ghexport.py index 3e17c10..80106a5 100644 --- a/my/github/ghexport.py +++ b/my/github/ghexport.py @@ -1,17 +1,13 @@ """ Github data: events, comments, etc. (API data) """ - -from __future__ import annotations - REQUIRES = [ 'git+https://github.com/karlicoss/ghexport', ] - from dataclasses import dataclass -from my.config import github as user_config from my.core import Paths +from my.config import github as user_config @dataclass @@ -25,9 +21,7 @@ class github(user_config): ### -from my.core.cfg import Attrs, make_config - - +from my.core.cfg import make_config, Attrs def migration(attrs: Attrs) -> Attrs: export_dir = 'export_dir' if export_dir in attrs: # legacy name @@ -47,14 +41,15 @@ except ModuleNotFoundError as e: ############################ -from collections.abc import Sequence from functools import lru_cache from pathlib import Path +from typing import Tuple, Dict, Sequence, Optional -from my.core import LazyLogger, get_files +from my.core import get_files, LazyLogger from my.core.cachew import mcachew -from .common import Event, EventIds, Results, parse_dt +from .common import Event, parse_dt, Results, EventIds + logger = LazyLogger(__name__) @@ -87,9 +82,7 @@ def _events() -> Results: yield e -from my.core import Stats, stat - - +from my.core import stat, Stats def stats() -> Stats: return { **stat(events), @@ -106,7 +99,7 @@ def _log_if_unhandled(e) -> None: Link = str EventId = str Body = str -def _get_summary(e) -> tuple[str, Link | None, EventId | None, Body | None]: +def _get_summary(e) -> Tuple[str, Optional[Link], Optional[EventId], Optional[Body]]: # TODO would be nice to give access to raw event within timeline dts = e['created_at'] eid = e['id'] @@ -202,7 +195,7 @@ def _get_summary(e) -> tuple[str, Link | None, EventId | None, Body | None]: return tp, None, None, None -def _parse_event(d: dict) -> Event: +def _parse_event(d: Dict) -> Event: summary, link, eid, body = _get_summary(d) if eid is None: eid = d['id'] # meh diff --git a/my/goodreads.py b/my/goodreads.py index 559efda..864bd64 100644 --- a/my/goodreads.py +++ b/my/goodreads.py @@ -7,18 +7,15 @@ REQUIRES = [ from dataclasses import dataclass - +from my.core import datetime_aware, Paths from my.config import goodreads as user_config -from my.core import Paths, datetime_aware - @dataclass class goodreads(user_config): # paths[s]/glob to the exported JSON data export_path: Paths -from my.core.cfg import Attrs, make_config - +from my.core.cfg import make_config, Attrs def _migration(attrs: Attrs) -> Attrs: export_dir = 'export_dir' @@ -32,19 +29,18 @@ config = make_config(goodreads, migration=_migration) #############################3 -from collections.abc import Iterator, Sequence -from pathlib import Path - from my.core import get_files - +from typing import Sequence, Iterator +from pathlib import Path def inputs() -> Sequence[Path]: return get_files(config.export_path) from datetime import datetime - import pytz + + from goodrexport import dal diff --git a/my/google/maps/_android_protobuf.py b/my/google/maps/_android_protobuf.py index 615623d..1d43ae0 100644 --- a/my/google/maps/_android_protobuf.py +++ b/my/google/maps/_android_protobuf.py @@ -1,8 +1,8 @@ -from my.core import __NOT_HPI_MODULE__ # isort: skip +from my.core import __NOT_HPI_MODULE__ # NOTE: this tool was quite useful https://github.com/aj3423/aproto -from google.protobuf import descriptor_pb2, descriptor_pool, message_factory +from google.protobuf import descriptor_pool, descriptor_pb2, message_factory TYPE_STRING = descriptor_pb2.FieldDescriptorProto.TYPE_STRING TYPE_BYTES = descriptor_pb2.FieldDescriptorProto.TYPE_BYTES diff --git a/my/google/maps/android.py b/my/google/maps/android.py index 95ecacf..279231a 100644 --- a/my/google/maps/android.py +++ b/my/google/maps/android.py @@ -7,20 +7,20 @@ REQUIRES = [ "protobuf", # for parsing blobs from the database ] -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path -from typing import Any +from typing import Any, Iterator, Optional, Sequence from urllib.parse import quote -from my.core import LazyLogger, Paths, Res, datetime_aware, get_files +from my.core import datetime_aware, get_files, LazyLogger, Paths, Res from my.core.common import unique_everseen from my.core.sqlite import sqlite_connection +import my.config + from ._android_protobuf import parse_labeled, parse_list, parse_place -import my.config # isort: skip logger = LazyLogger(__name__) @@ -59,8 +59,8 @@ class Place: updated_at: datetime_aware # TODO double check it's utc? title: str location: Location - address: str | None - note: str | None + address: Optional[str] + note: Optional[str] @property def place_url(self) -> str: diff --git a/my/google/takeout/html.py b/my/google/takeout/html.py index 3f2b5db..750beac 100644 --- a/my/google/takeout/html.py +++ b/my/google/takeout/html.py @@ -2,22 +2,18 @@ Google Takeout exports: browsing history, search/youtube/google play activity ''' -from __future__ import annotations - -from my.core import __NOT_HPI_MODULE__ # isort: skip - -import re -from collections.abc import Iterable -from datetime import datetime from enum import Enum -from html.parser import HTMLParser +import re from pathlib import Path -from typing import Any, Callable +from datetime import datetime +from html.parser import HTMLParser +from typing import List, Optional, Any, Callable, Iterable, Tuple from urllib.parse import unquote import pytz -from my.core.time import abbr_to_timezone +from ...core.time import abbr_to_timezone + # NOTE: https://bugs.python.org/issue22377 %Z doesn't work properly _TIME_FORMATS = [ @@ -40,7 +36,7 @@ def parse_dt(s: str) -> datetime: s, tzabbr = s.rsplit(maxsplit=1) tz = abbr_to_timezone(tzabbr) - dt: datetime | None = None + dt: Optional[datetime] = None for fmt in _TIME_FORMATS: try: dt = datetime.strptime(s, fmt) @@ -77,7 +73,7 @@ class State(Enum): Url = str Title = str -Parsed = tuple[datetime, Url, Title] +Parsed = Tuple[datetime, Url, Title] Callback = Callable[[datetime, Url, Title], None] @@ -87,9 +83,9 @@ class TakeoutHTMLParser(HTMLParser): super().__init__() self.state: State = State.OUTSIDE - self.title_parts: list[str] = [] - self.title: str | None = None - self.url: str | None = None + self.title_parts: List[str] = [] + self.title: Optional[str] = None + self.url: Optional[str] = None self.callback = callback @@ -152,7 +148,7 @@ class TakeoutHTMLParser(HTMLParser): def read_html(tpath: Path, file: str) -> Iterable[Parsed]: - results: list[Parsed] = [] + results: List[Parsed] = [] def cb(dt: datetime, url: Url, title: Title) -> None: results.append((dt, url, title)) parser = TakeoutHTMLParser(callback=cb) @@ -160,3 +156,5 @@ def read_html(tpath: Path, file: str) -> Iterable[Parsed]: data = fo.read() parser.feed(data) return results + +from ...core import __NOT_HPI_MODULE__ diff --git a/my/google/takeout/parser.py b/my/google/takeout/parser.py index 13fd04a..170553a 100644 --- a/my/google/takeout/parser.py +++ b/my/google/takeout/parser.py @@ -1,7 +1,7 @@ """ -Parses Google Takeout using [[https://github.com/purarue/google_takeout_parser][google_takeout_parser]] +Parses Google Takeout using [[https://github.com/seanbreckenridge/google_takeout_parser][google_takeout_parser]] -See [[https://github.com/purarue/google_takeout_parser][google_takeout_parser]] for more information +See [[https://github.com/seanbreckenridge/google_takeout_parser][google_takeout_parser]] for more information about how to export and organize your takeouts If the DISABLE_TAKEOUT_CACHE environment variable is set, this won't cache individual @@ -12,31 +12,28 @@ zip files of the exports, which are temporarily unpacked while creating the cachew cache """ -REQUIRES = ["git+https://github.com/purarue/google_takeout_parser"] +REQUIRES = ["git+https://github.com/seanbreckenridge/google_takeout_parser"] -import os -from collections.abc import Sequence from contextlib import ExitStack from dataclasses import dataclass +import os +from typing import List, Sequence, cast from pathlib import Path -from typing import cast - -from google_takeout_parser.parse_html.html_time_utils import ABBR_TIMEZONES - -from my.core import Paths, Stats, get_files, make_config, make_logger, stat +from my.core import make_config, stat, Stats, get_files, Paths, make_logger from my.core.cachew import mcachew from my.core.error import ErrorPolicy from my.core.structure import match_structure -from my.core.time import user_forced +from my.core.time import user_forced +from google_takeout_parser.parse_html.html_time_utils import ABBR_TIMEZONES ABBR_TIMEZONES.extend(user_forced()) import google_takeout_parser -from google_takeout_parser.merge import CacheResults, GoogleEventSet -from google_takeout_parser.models import BaseEvent from google_takeout_parser.path_dispatch import TakeoutParser +from google_takeout_parser.merge import GoogleEventSet, CacheResults +from google_takeout_parser.models import BaseEvent -# see https://github.com/purarue/dotfiles/blob/master/.config/my/my/config/__init__.py for an example +# see https://github.com/seanbreckenridge/dotfiles/blob/master/.config/my/my/config/__init__.py for an example from my.config import google as user_config @@ -59,7 +56,6 @@ logger = make_logger(__name__, level="warning") # patch the takeout parser logger to match the computed loglevel from google_takeout_parser.log import setup as setup_takeout_logger - setup_takeout_logger(logger.level) @@ -87,7 +83,7 @@ except ImportError: google_takeout_version = str(getattr(google_takeout_parser, '__version__', 'unknown')) -def _cachew_depends_on() -> list[str]: +def _cachew_depends_on() -> List[str]: exports = sorted([str(p) for p in inputs()]) # add google takeout parser pip version to hash, so this re-creates on breaking changes exports.insert(0, f"google_takeout_version: {google_takeout_version}") @@ -123,7 +119,7 @@ def events(disable_takeout_cache: bool = DISABLE_TAKEOUT_CACHE) -> CacheResults: else: results = exit_stack.enter_context(match_structure(path, expected=EXPECTED, partial=True)) for m in results: - # e.g. /home/username/data/google_takeout/Takeout-1634932457.zip") -> 'Takeout-1634932457' + # e.g. /home/sean/data/google_takeout/Takeout-1634932457.zip") -> 'Takeout-1634932457' # means that zipped takeouts have nice filenames from cachew cw_id, _, _ = path.name.rpartition(".") # each takeout result is cached as well, in individual databases per-type diff --git a/my/google/takeout/paths.py b/my/google/takeout/paths.py index 6a523e2..948cf2e 100644 --- a/my/google/takeout/paths.py +++ b/my/google/takeout/paths.py @@ -2,17 +2,13 @@ Module for locating and accessing [[https://takeout.google.com][Google Takeout]] data ''' -from __future__ import annotations - -from my.core import __NOT_HPI_MODULE__ # isort: skip - from abc import abstractmethod -from collections.abc import Iterable from pathlib import Path +from typing import Iterable, Optional, Protocol from more_itertools import last -from my.core import Paths, get_files +from my.core import __NOT_HPI_MODULE__, Paths, get_files class config: @@ -37,7 +33,7 @@ def make_config() -> config: return combined_config() -def get_takeouts(*, path: str | None = None) -> Iterable[Path]: +def get_takeouts(*, path: Optional[str] = None) -> Iterable[Path]: """ Sometimes google splits takeout into multiple archives, so we need to detect the ones that contain the path we need """ @@ -49,7 +45,7 @@ def get_takeouts(*, path: str | None = None) -> Iterable[Path]: yield takeout -def get_last_takeout(*, path: str | None = None) -> Path | None: +def get_last_takeout(*, path: Optional[str] = None) -> Optional[Path]: return last(get_takeouts(path=path), default=None) diff --git a/my/hackernews/dogsheep.py b/my/hackernews/dogsheep.py index 8303284..de6c58d 100644 --- a/my/hackernews/dogsheep.py +++ b/my/hackernews/dogsheep.py @@ -3,14 +3,14 @@ Hackernews data via Dogsheep [[hacker-news-to-sqlite][https://github.com/dogshee """ from __future__ import annotations -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path +from typing import Iterator, Sequence, Optional -import my.config -from my.core import Paths, Res, datetime_aware, get_files +from my.core import get_files, Paths, Res, datetime_aware from my.core.sqlite import sqlite_connection +import my.config from .common import hackernews_link @@ -33,9 +33,9 @@ class Item: id: str type: str created: datetime_aware # checked and it's utc - title: str | None # only present for Story - text_html: str | None # should be present for Comment and might for Story - url: str | None # might be present for Story + title: Optional[str] # only present for Story + text_html: Optional[str] # should be present for Comment and might for Story + url: Optional[str] # might be present for Story # todo process 'deleted'? fields? # todo process 'parent'? diff --git a/my/hackernews/harmonic.py b/my/hackernews/harmonic.py index 08a82e6..3b4ae61 100644 --- a/my/hackernews/harmonic.py +++ b/my/hackernews/harmonic.py @@ -1,22 +1,17 @@ """ [[https://play.google.com/store/apps/details?id=com.simon.harmonichackernews][Harmonic]] app for Hackernews """ - -from __future__ import annotations - REQUIRES = ['lxml', 'orjson'] -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone -from pathlib import Path -from typing import Any, TypedDict, cast - import orjson +from pathlib import Path +from typing import Any, Dict, Iterator, List, Optional, Sequence, TypedDict, cast + from lxml import etree from more_itertools import one -import my.config from my.core import ( Paths, Res, @@ -27,10 +22,8 @@ from my.core import ( stat, ) from my.core.common import unique_everseen - -from .common import SavedBase, hackernews_link - -import my.config # isort: skip +import my.config +from .common import hackernews_link, SavedBase logger = make_logger(__name__) @@ -50,7 +43,7 @@ class Cached(TypedDict): created_at_i: int id: str points: int - test: str | None + test: Optional[str] title: str type: str # TODO Literal['story', 'comment']? comments are only in 'children' field tho url: str @@ -101,16 +94,16 @@ def _saved() -> Iterator[Res[Saved]]: # TODO defensive for each item! tr = etree.parse(path) - res = one(cast(list[Any], tr.xpath(f'//*[@name="{_PREFIX}_CACHED_STORIES_STRINGS"]'))) + res = one(cast(List[Any], tr.xpath(f'//*[@name="{_PREFIX}_CACHED_STORIES_STRINGS"]'))) cached_ids = [x.text.split('-')[0] for x in res] - cached: dict[str, Cached] = {} + cached: Dict[str, Cached] = {} for sid in cached_ids: - res = one(cast(list[Any], tr.xpath(f'//*[@name="{_PREFIX}_CACHED_STORY{sid}"]'))) + res = one(cast(List[Any], tr.xpath(f'//*[@name="{_PREFIX}_CACHED_STORY{sid}"]'))) j = orjson.loads(res.text) cached[sid] = j - res = one(cast(list[Any], tr.xpath(f'//*[@name="{_PREFIX}_BOOKMARKS"]'))) + res = one(cast(List[Any], tr.xpath(f'//*[@name="{_PREFIX}_BOOKMARKS"]'))) for x in res.text.split('-'): ids, item_timestamp = x.split('q') # not sure if timestamp is any useful? diff --git a/my/hackernews/materialistic.py b/my/hackernews/materialistic.py index ccf285b..4d5cd47 100644 --- a/my/hackernews/materialistic.py +++ b/my/hackernews/materialistic.py @@ -1,20 +1,19 @@ """ [[https://play.google.com/store/apps/details?id=io.github.hidroh.materialistic][Materialistic]] app for Hackernews """ -from collections.abc import Iterator, Sequence from datetime import datetime, timezone from pathlib import Path -from typing import Any, NamedTuple +from typing import Any, Dict, Iterator, NamedTuple, Sequence from more_itertools import unique_everseen -from my.core import datetime_aware, get_files, make_logger +from my.core import get_files, datetime_aware, make_logger from my.core.sqlite import sqlite_connection +from my.config import materialistic as config # todo migrate config to my.hackernews.materialistic + from .common import hackernews_link -# todo migrate config to my.hackernews.materialistic -from my.config import materialistic as config # isort: skip logger = make_logger(__name__) @@ -23,7 +22,7 @@ def inputs() -> Sequence[Path]: return get_files(config.export_path) -Row = dict[str, Any] +Row = Dict[str, Any] class Saved(NamedTuple): diff --git a/my/hypothesis.py b/my/hypothesis.py index 15e854b..82104cd 100644 --- a/my/hypothesis.py +++ b/my/hypothesis.py @@ -4,22 +4,20 @@ REQUIRES = [ 'git+https://github.com/karlicoss/hypexport', ] -from collections.abc import Iterator, Sequence from dataclasses import dataclass from pathlib import Path -from typing import TYPE_CHECKING +from typing import Iterator, Sequence, TYPE_CHECKING from my.core import ( + get_files, + stat, Paths, Res, Stats, - get_files, - stat, ) from my.core.cfg import make_config from my.core.hpi_compat import always_supports_sequence - -import my.config # isort: skip +import my.config @dataclass diff --git a/my/instagram/all.py b/my/instagram/all.py index ce78409..8007399 100644 --- a/my/instagram/all.py +++ b/my/instagram/all.py @@ -1,10 +1,11 @@ -from collections.abc import Iterator +from typing import Iterator -from my.core import Res, Stats, stat +from my.core import Res, stat, Stats from my.core.source import import_source from .common import Message, _merge_messages + src_gdpr = import_source(module_name='my.instagram.gdpr') @src_gdpr def _messages_gdpr() -> Iterator[Res[Message]]: @@ -23,7 +24,7 @@ def messages() -> Iterator[Res[Message]]: # TODO in general best to prefer android, it has more data # - message ids # - usernames are correct for Android data - # - thread ids more meaningful? + # - thread ids more meaninful? # but for now prefer gdpr prefix since it makes a bit things a bit more consistent? # e.g. a new batch of android exports can throw off ids if we rely on it for mapping yield from _merge_messages( diff --git a/my/instagram/android.py b/my/instagram/android.py index 12c11d3..96b75d2 100644 --- a/my/instagram/android.py +++ b/my/instagram/android.py @@ -3,29 +3,30 @@ Bumble data from Android app database (in =/data/data/com.instagram.android/data """ from __future__ import annotations -import json -import sqlite3 -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime +import json from pathlib import Path +import sqlite3 +from typing import Iterator, Sequence, Optional, Dict, Union from my.core import ( - Json, - Paths, - Res, - assert_never, - datetime_naive, get_files, + Paths, make_config, make_logger, + datetime_naive, + Json, + Res, + assert_never, ) -from my.core.cachew import mcachew from my.core.common import unique_everseen +from my.core.cachew import mcachew from my.core.error import echain -from my.core.sqlite import select, sqlite_connect_immutable +from my.core.sqlite import sqlite_connect_immutable, select + +from my.config import instagram as user_config -from my.config import instagram as user_config # isort: skip logger = make_logger(__name__) @@ -37,8 +38,8 @@ class instagram_android_config(user_config.android): # sadly doesn't seem easy to extract user's own handle/name from the db... # todo maybe makes more sense to keep in parent class? not sure... - username: str | None = None - full_name: str | None = None + username: Optional[str] = None + full_name: Optional[str] = None config = make_config(instagram_android_config) @@ -100,13 +101,13 @@ class MessageError(RuntimeError): return self.rest == other.rest -def _parse_message(j: Json) -> _Message | None: +def _parse_message(j: Json) -> Optional[_Message]: id = j['item_id'] t = j['item_type'] tid = j['thread_key']['thread_id'] uid = j['user_id'] created = datetime.fromtimestamp(int(j['timestamp']) / 1_000_000) - text: str | None = None + text: Optional[str] = None if t == 'text': text = j['text'] elif t == 'reel_share': @@ -132,7 +133,7 @@ def _parse_message(j: Json) -> _Message | None: ) -def _process_db(db: sqlite3.Connection) -> Iterator[Res[User | _Message]]: +def _process_db(db: sqlite3.Connection) -> Iterator[Res[Union[User, _Message]]]: # TODO ugh. seems like no way to extract username? # sometimes messages (e.g. media_share) contain it in message field # but generally it's not present. ugh @@ -174,7 +175,7 @@ def _process_db(db: sqlite3.Connection) -> Iterator[Res[User | _Message]]: yield e -def _entities() -> Iterator[Res[User | _Message]]: +def _entities() -> Iterator[Res[Union[User, _Message]]]: # NOTE: definitely need to merge multiple, app seems to recycle old messages # TODO: hmm hard to guarantee timestamp ordering when we use synthetic input data... # todo use TypedDict? @@ -193,7 +194,7 @@ def _entities() -> Iterator[Res[User | _Message]]: @mcachew(depends_on=inputs) def messages() -> Iterator[Res[Message]]: - id2user: dict[str, User] = {} + id2user: Dict[str, User] = {} for x in unique_everseen(_entities): if isinstance(x, Exception): yield x diff --git a/my/instagram/common.py b/my/instagram/common.py index 17d130f..4df07a1 100644 --- a/my/instagram/common.py +++ b/my/instagram/common.py @@ -1,10 +1,9 @@ -from collections.abc import Iterator from dataclasses import replace from datetime import datetime from itertools import chain -from typing import Any, Protocol +from typing import Iterator, Dict, Any, Protocol -from my.core import Res, warn_if_empty +from my.core import warn_if_empty, Res class User(Protocol): @@ -41,7 +40,7 @@ def _merge_messages(*sources: Iterator[Res[Message]]) -> Iterator[Res[Message]]: # ugh. seems that GDPR thread ids are completely uncorrelated to any android ids (tried searching over all sqlite dump) # so the only way to correlate is to try and match messages # we also can't use unique_everseen here, otherwise will never get a chance to unify threads - mmap: dict[str, Message] = {} + mmap: Dict[str, Message] = {} thread_map = {} user_map = {} @@ -61,7 +60,7 @@ def _merge_messages(*sources: Iterator[Res[Message]]) -> Iterator[Res[Message]]: user_map[m.user.id] = mm.user else: # not emitted yet, need to emit - repls: dict[str, Any] = {} + repls: Dict[str, Any] = {} tid = thread_map.get(m.thread_id) if tid is not None: repls['thread_id'] = tid diff --git a/my/instagram/gdpr.py b/my/instagram/gdpr.py index d417fdb..1415d55 100644 --- a/my/instagram/gdpr.py +++ b/my/instagram/gdpr.py @@ -2,27 +2,26 @@ Instagram data (uses [[https://www.instagram.com/download/request][official GDPR export]]) """ -from __future__ import annotations - -import json -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime +import json from pathlib import Path +from typing import Iterator, Sequence, Dict, Union from more_itertools import bucket from my.core import ( + get_files, Paths, + datetime_naive, Res, assert_never, - datetime_naive, - get_files, make_logger, ) from my.core.common import unique_everseen -from my.config import instagram as user_config # isort: skip +from my.config import instagram as user_config + logger = make_logger(__name__) @@ -71,12 +70,12 @@ def _decode(s: str) -> str: return s.encode('latin-1').decode('utf8') -def _entities() -> Iterator[Res[User | _Message]]: +def _entities() -> Iterator[Res[Union[User, _Message]]]: # it's worth processing all previous export -- sometimes instagram removes some metadata from newer ones # NOTE: here there are basically two options # - process inputs as is (from oldest to newest) # this would be more stable wrt newer exports (e.g. existing thread ids won't change) - # the downside is that newer exports seem to have better thread ids, so might be preferable to use them + # the downside is that newer exports seem to have better thread ids, so might be preferrable to use them # - process inputs reversed (from newest to oldest) # the upside is that thread ids/usernames might be better # the downside is that if for example the user renames, thread ids will change _a lot_, might be undesirable.. @@ -85,7 +84,7 @@ def _entities() -> Iterator[Res[User | _Message]]: yield from _entitites_from_path(path) -def _entitites_from_path(path: Path) -> Iterator[Res[User | _Message]]: +def _entitites_from_path(path: Path) -> Iterator[Res[Union[User, _Message]]]: # TODO make sure it works both with plan directory # idelaly get_files should return the right thing, and we won't have to force ZipPath/match_structure here # e.g. possible options are: @@ -137,7 +136,7 @@ def _entitites_from_path(path: Path) -> Iterator[Res[User | _Message]]: j = json.loads(ffile.read_text()) id_len = 10 - # NOTE: I'm not actually sure it's other user's id.., since it corresponds to the whole conversation + # NOTE: I'm not actually sure it's other user's id.., since it corresponds to the whole converstation # but I stared a bit at these ids vs database ids and can't see any way to find the correspondence :( # so basically the only way to merge is to actually try some magic and correlate timestamps/message texts? # another option is perhaps to query user id from username with some free API @@ -203,7 +202,7 @@ def _entitites_from_path(path: Path) -> Iterator[Res[User | _Message]]: # TODO basically copy pasted from android.py... hmm def messages() -> Iterator[Res[Message]]: - id2user: dict[str, User] = {} + id2user: Dict[str, User] = {} for x in unique_everseen(_entities): if isinstance(x, Exception): yield x diff --git a/my/instapaper.py b/my/instapaper.py index d79e7e4..df1f70b 100644 --- a/my/instapaper.py +++ b/my/instapaper.py @@ -7,10 +7,10 @@ REQUIRES = [ from dataclasses import dataclass -from my.config import instapaper as user_config - from .core import Paths +from my.config import instapaper as user_config + @dataclass class instapaper(user_config): @@ -22,7 +22,6 @@ class instapaper(user_config): from .core.cfg import make_config - config = make_config(instapaper) @@ -40,12 +39,9 @@ Bookmark = dal.Bookmark Page = dal.Page -from collections.abc import Iterable, Sequence +from typing import Sequence, Iterable from pathlib import Path - from .core import get_files - - def inputs() -> Sequence[Path]: return get_files(config.export_path) diff --git a/my/ip/all.py b/my/ip/all.py index c267383..46c1fec 100644 --- a/my/ip/all.py +++ b/my/ip/all.py @@ -3,15 +3,16 @@ An example all.py stub module that provides ip data To use this, you'd add IP providers that yield IPs to the 'ips' function -For an example of how this could be used, see https://github.com/purarue/HPI/tree/master/my/ip +For an example of how this could be used, see https://github.com/seanbreckenridge/HPI/tree/master/my/ip """ -REQUIRES = ["git+https://github.com/purarue/ipgeocache"] +REQUIRES = ["git+https://github.com/seanbreckenridge/ipgeocache"] -from collections.abc import Iterator +from typing import Iterator from my.core import Stats, warn_if_empty + from my.ip.common import IP diff --git a/my/ip/common.py b/my/ip/common.py index b551281..244ddc5 100644 --- a/my/ip/common.py +++ b/my/ip/common.py @@ -1,13 +1,12 @@ """ -Provides location/timezone data from IP addresses, using [[https://github.com/purarue/ipgeocache][ipgeocache]] +Provides location/timezone data from IP addresses, using [[https://github.com/seanbreckenridge/ipgeocache][ipgeocache]] """ -from my.core import __NOT_HPI_MODULE__ # isort: skip +from my.core import __NOT_HPI_MODULE__ import ipaddress -from collections.abc import Iterator +from typing import NamedTuple, Iterator, Tuple from datetime import datetime -from typing import NamedTuple import ipgeocache @@ -23,7 +22,7 @@ class IP(NamedTuple): return ipgeocache.get(self.addr) @property - def latlon(self) -> tuple[float, float]: + def latlon(self) -> Tuple[float, float]: loc: str = self.ipgeocache()["loc"] lat, _, lon = loc.partition(",") return float(lat), float(lon) diff --git a/my/jawbone/__init__.py b/my/jawbone/__init__.py index 463d735..35112ba 100644 --- a/my/jawbone/__init__.py +++ b/my/jawbone/__init__.py @@ -1,11 +1,10 @@ from __future__ import annotations +from typing import Dict, Any, List, Iterable import json -from collections.abc import Iterable -from datetime import date, datetime, time, timedelta from functools import lru_cache +from datetime import datetime, date, time, timedelta from pathlib import Path -from typing import Any import pytz @@ -15,6 +14,7 @@ logger = make_logger(__name__) from my.config import jawbone as config # type: ignore[attr-defined] + BDIR = config.export_dir PHASES_FILE = BDIR / 'phases.json' SLEEPS_FILE = BDIR / 'sleeps.json' @@ -24,7 +24,7 @@ GRAPHS_DIR = BDIR / 'graphs' XID = str # TODO how to shared with backup thing? -Phases = dict[XID, Any] +Phases = Dict[XID, Any] @lru_cache(1) def get_phases() -> Phases: return json.loads(PHASES_FILE.read_text()) @@ -89,7 +89,7 @@ class SleepEntry: # TODO might be useful to cache these?? @property - def phases(self) -> list[datetime]: + def phases(self) -> List[datetime]: # TODO make sure they are consistent with emfit? return [self._fromts(i['time']) for i in get_phases()[self.xid]] @@ -100,13 +100,12 @@ class SleepEntry: return str(self) -def load_sleeps() -> list[SleepEntry]: +def load_sleeps() -> List[SleepEntry]: sleeps = json.loads(SLEEPS_FILE.read_text()) return [SleepEntry(js) for js in sleeps] -from ..core.error import Res, extract_error_datetime, set_error_datetime - +from ..core.error import Res, set_error_datetime, extract_error_datetime def pre_dataframe() -> Iterable[Res[SleepEntry]]: from more_itertools import bucket @@ -130,9 +129,9 @@ def pre_dataframe() -> Iterable[Res[SleepEntry]]: def dataframe(): - dicts: list[dict[str, Any]] = [] + dicts: List[Dict[str, Any]] = [] for s in pre_dataframe(): - d: dict[str, Any] + d: Dict[str, Any] if isinstance(s, Exception): dt = extract_error_datetime(s) d = { @@ -182,7 +181,7 @@ def plot_one(sleep: SleepEntry, fig, axes, xlims=None, *, showtext=True): print(f"{sleep.xid} span: {span}") # pip install imageio - from imageio import imread # type: ignore + from imageio import imread # type: ignore img = imread(sleep.graph) # all of them are 300x300 images apparently @@ -261,8 +260,8 @@ def predicate(sleep: SleepEntry): # TODO move to dashboard def plot() -> None: - import matplotlib.pyplot as plt # type: ignore[import-not-found] from matplotlib.figure import Figure # type: ignore[import-not-found] + import matplotlib.pyplot as plt # type: ignore[import-not-found] # TODO FIXME melatonin data melatonin_data = {} # type: ignore[var-annotated] diff --git a/my/jawbone/plots.py b/my/jawbone/plots.py index 5968412..d26d606 100755 --- a/my/jawbone/plots.py +++ b/my/jawbone/plots.py @@ -1,11 +1,10 @@ #!/usr/bin/env python3 # TODO this should be in dashboard +from pathlib import Path # from kython.plotting import * from csv import DictReader -from pathlib import Path -from typing import Any, NamedTuple -import matplotlib.pylab as pylab # type: ignore +from typing import Dict, Any, NamedTuple # sleep = [] # with open('2017.csv', 'r') as fo: @@ -13,14 +12,16 @@ import matplotlib.pylab as pylab # type: ignore # for line in islice(reader, 0, 10): # sleep # print(line) -import matplotlib.pyplot as plt # type: ignore + +import matplotlib.pyplot as plt # type: ignore from numpy import genfromtxt +import matplotlib.pylab as pylab # type: ignore pylab.rcParams['figure.figsize'] = (32.0, 24.0) pylab.rcParams['font.size'] = 10 jawboneDataFeatures = Path(__file__).parent / 'features.csv' # Data File Path -featureDesc: dict[str, str] = {} +featureDesc: Dict[str, str] = {} for x in genfromtxt(jawboneDataFeatures, dtype='unicode', delimiter=','): featureDesc[x[0]] = x[1] @@ -51,7 +52,7 @@ class SleepData(NamedTuple): quality: float # ??? @classmethod - def from_jawbone_dict(cls, d: dict[str, Any]): + def from_jawbone_dict(cls, d: Dict[str, Any]): return cls( date=d['DATE'], asleep_time=_safe_mins(_safe_float(d['s_asleep_time'])), @@ -74,7 +75,7 @@ class SleepData(NamedTuple): def iter_useful(data_file: str): - with Path(data_file).open() as fo: + with open(data_file) as fo: reader = DictReader(fo) for d in reader: dt = SleepData.from_jawbone_dict(d) @@ -94,7 +95,6 @@ files = [ ] from kython import concat, parse_date # type: ignore - useful = concat(*(list(iter_useful(str(f))) for f in files)) # for u in useful: @@ -108,7 +108,6 @@ dates = [parse_date(u.date, yearfirst=True, dayfirst=False) for u in useful] # TODO don't need this anymore? it's gonna be in dashboards package from kython.plotting import plot_timestamped # type: ignore - for attr, lims, mavg, fig in [ ('light', (0, 400), 5, None), ('deep', (0, 600), 5, None), diff --git a/my/kobo.py b/my/kobo.py index b4a1575..85bc50f 100644 --- a/my/kobo.py +++ b/my/kobo.py @@ -7,22 +7,21 @@ REQUIRES = [ 'kobuddy', ] -from collections.abc import Iterator from dataclasses import dataclass - -import kobuddy -from kobuddy import * -from kobuddy import Highlight, get_highlights +from typing import Iterator from my.core import ( - Paths, - Stats, get_files, stat, + Paths, + Stats, ) from my.core.cfg import make_config +import my.config -import my.config # isort: skip +import kobuddy +from kobuddy import Highlight, get_highlights +from kobuddy import * @dataclass @@ -52,7 +51,7 @@ def stats() -> Stats: ## TODO hmm. not sure if all this really belongs here?... perhaps orger? -from typing import Callable, Union +from typing import Callable, Union, List # TODO maybe type over T? _Predicate = Callable[[str], bool] @@ -70,17 +69,17 @@ def from_predicatish(p: Predicatish) -> _Predicate: return p -def by_annotation(predicatish: Predicatish, **kwargs) -> list[Highlight]: +def by_annotation(predicatish: Predicatish, **kwargs) -> List[Highlight]: pred = from_predicatish(predicatish) - res: list[Highlight] = [] + res: List[Highlight] = [] for h in get_highlights(**kwargs): if pred(h.annotation): res.append(h) return res -def get_todos() -> list[Highlight]: +def get_todos() -> List[Highlight]: def with_todo(ann): if ann is None: ann = '' diff --git a/my/kython/kompress.py b/my/kython/kompress.py index a5d9c29..01e24e4 100644 --- a/my/kython/kompress.py +++ b/my/kython/kompress.py @@ -1,4 +1,5 @@ -from my.core import __NOT_HPI_MODULE__, warnings +from my.core import __NOT_HPI_MODULE__ +from my.core import warnings warnings.high('my.kython.kompress is deprecated, please use "kompress" library directly. See https://github.com/karlicoss/kompress') diff --git a/my/lastfm.py b/my/lastfm.py index cd9fa8b..d20ebf3 100644 --- a/my/lastfm.py +++ b/my/lastfm.py @@ -3,9 +3,9 @@ Last.fm scrobbles ''' from dataclasses import dataclass - +from my.core import Paths, Json, make_logger, get_files from my.config import lastfm as user_config -from my.core import Json, Paths, get_files, make_logger + logger = make_logger(__name__) @@ -19,15 +19,13 @@ class lastfm(user_config): from my.core.cfg import make_config - config = make_config(lastfm) -import json -from collections.abc import Iterable, Sequence from datetime import datetime, timezone +import json from pathlib import Path -from typing import NamedTuple +from typing import NamedTuple, Sequence, Iterable from my.core.cachew import mcachew @@ -78,9 +76,7 @@ def scrobbles() -> Iterable[Scrobble]: yield Scrobble(raw=raw) -from my.core import Stats, stat - - +from my.core import stat, Stats def stats() -> Stats: return stat(scrobbles) diff --git a/my/location/all.py b/my/location/all.py index c6e8cab..fd88721 100644 --- a/my/location/all.py +++ b/my/location/all.py @@ -2,13 +2,14 @@ Merges location data from multiple sources """ -from collections.abc import Iterator +from typing import Iterator -from my.core import LazyLogger, Stats +from my.core import Stats, LazyLogger from my.core.source import import_source from .common import Location + logger = LazyLogger(__name__, level="warning") diff --git a/my/location/common.py b/my/location/common.py index 4c47ef0..f406370 100644 --- a/my/location/common.py +++ b/my/location/common.py @@ -1,13 +1,12 @@ -from my.core import __NOT_HPI_MODULE__ # isort: skip - -from collections.abc import Iterable, Iterator -from dataclasses import dataclass from datetime import date, datetime -from typing import Optional, Protocol, TextIO, Union +from typing import Union, Tuple, Optional, Iterable, TextIO, Iterator, Protocol +from dataclasses import dataclass + +from my.core import __NOT_HPI_MODULE__ DateIsh = Union[datetime, date, str] -LatLon = tuple[float, float] +LatLon = Tuple[float, float] class LocationProtocol(Protocol): diff --git a/my/location/fallback/all.py b/my/location/fallback/all.py index d340148..a5daa05 100644 --- a/my/location/fallback/all.py +++ b/my/location/fallback/all.py @@ -1,16 +1,14 @@ # TODO: add config here which passes kwargs to estimate_from (under_accuracy) # overwritable by passing the kwarg name here to the top-level estimate_location -from __future__ import annotations - -from collections.abc import Iterator +from typing import Iterator, Optional from my.core.source import import_source from my.location.fallback.common import ( - DateExact, - FallbackLocation, - LocationEstimator, estimate_from, + FallbackLocation, + DateExact, + LocationEstimator, ) @@ -26,7 +24,7 @@ def fallback_estimators() -> Iterator[LocationEstimator]: yield _home_estimate -def estimate_location(dt: DateExact, *, first_match: bool=False, under_accuracy: int | None = None) -> FallbackLocation: +def estimate_location(dt: DateExact, *, first_match: bool=False, under_accuracy: Optional[int] = None) -> FallbackLocation: loc = estimate_from(dt, estimators=list(fallback_estimators()), first_match=first_match, under_accuracy=under_accuracy) # should never happen if the user has home configured if loc is None: diff --git a/my/location/fallback/common.py b/my/location/fallback/common.py index 622b2f5..13bc603 100644 --- a/my/location/fallback/common.py +++ b/my/location/fallback/common.py @@ -1,12 +1,9 @@ from __future__ import annotations - -from collections.abc import Iterator, Sequence from dataclasses import dataclass +from typing import Optional, Callable, Sequence, Iterator, List, Union from datetime import datetime, timedelta, timezone -from typing import Callable, Union - -from ..common import Location, LocationProtocol +from ..common import LocationProtocol, Location DateExact = Union[datetime, float, int] # float/int as epoch timestamps Second = float @@ -16,10 +13,10 @@ class FallbackLocation(LocationProtocol): lat: float lon: float dt: datetime - duration: Second | None = None - accuracy: float | None = None - elevation: float | None = None - datasource: str | None = None # which module provided this, useful for debugging + duration: Optional[Second] = None + accuracy: Optional[float] = None + elevation: Optional[float] = None + datasource: Optional[str] = None # which module provided this, useful for debugging def to_location(self, *, end: bool = False) -> Location: ''' @@ -46,9 +43,9 @@ class FallbackLocation(LocationProtocol): lon: float, dt: datetime, end_dt: datetime, - accuracy: float | None = None, - elevation: float | None = None, - datasource: str | None = None, + accuracy: Optional[float] = None, + elevation: Optional[float] = None, + datasource: Optional[str] = None, ) -> FallbackLocation: ''' Create FallbackLocation from a start date and an end date @@ -96,13 +93,13 @@ def estimate_from( estimators: LocationEstimators, *, first_match: bool = False, - under_accuracy: int | None = None, -) -> FallbackLocation | None: + under_accuracy: Optional[int] = None, +) -> Optional[FallbackLocation]: ''' first_match: if True, return the first location found under_accuracy: if set, only return locations with accuracy under this value ''' - found: list[FallbackLocation] = [] + found: List[FallbackLocation] = [] for loc in _iter_estimate_from(dt, estimators): if under_accuracy is not None and loc.accuracy is not None and loc.accuracy > under_accuracy: continue diff --git a/my/location/fallback/via_home.py b/my/location/fallback/via_home.py index f88fee0..e44c59d 100644 --- a/my/location/fallback/via_home.py +++ b/my/location/fallback/via_home.py @@ -2,22 +2,25 @@ Simple location provider, serving as a fallback when more detailed data isn't available ''' -from __future__ import annotations - -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, time, timezone -from functools import cache -from typing import cast +from functools import lru_cache +from typing import Sequence, Tuple, Union, cast, List, Iterator from my.config import location as user_config -from my.location.common import DateIsh, LatLon -from my.location.fallback.common import DateExact, FallbackLocation +from my.location.common import LatLon, DateIsh +from my.location.fallback.common import FallbackLocation, DateExact @dataclass class Config(user_config): - home: LatLon | Sequence[tuple[DateIsh, LatLon]] + home: Union[ + LatLon, # either single, 'current' location + Sequence[Tuple[ # or, a sequence of location history + DateIsh, # date when you moved to + LatLon, # the location + ]] + ] # default ~30km accuracy # this is called 'home_accuracy' since it lives on the base location.config object, @@ -26,13 +29,13 @@ class Config(user_config): # TODO could make current Optional and somehow determine from system settings? @property - def _history(self) -> Sequence[tuple[datetime, LatLon]]: + def _history(self) -> Sequence[Tuple[datetime, LatLon]]: home1 = self.home # todo ugh, can't test for isnstance LatLon, it's a tuple itself - home2: Sequence[tuple[DateIsh, LatLon]] + home2: Sequence[Tuple[DateIsh, LatLon]] if isinstance(home1[0], tuple): # already a sequence - home2 = cast(Sequence[tuple[DateIsh, LatLon]], home1) + home2 = cast(Sequence[Tuple[DateIsh, LatLon]], home1) else: # must be a pair of coordinates. also doesn't really matter which date to pick? loc = cast(LatLon, home1) @@ -57,11 +60,10 @@ class Config(user_config): from ...core.cfg import make_config - config = make_config(Config) -@cache +@lru_cache(maxsize=None) def get_location(dt: datetime) -> LatLon: ''' Interpolates the location at dt @@ -72,8 +74,8 @@ def get_location(dt: datetime) -> LatLon: # TODO: in python3.8, use functools.cached_property instead? -@cache -def homes_cached() -> list[tuple[datetime, LatLon]]: +@lru_cache(maxsize=None) +def homes_cached() -> List[Tuple[datetime, LatLon]]: return list(config._history) diff --git a/my/location/fallback/via_ip.py b/my/location/fallback/via_ip.py index 8b50878..79a452c 100644 --- a/my/location/fallback/via_ip.py +++ b/my/location/fallback/via_ip.py @@ -2,13 +2,13 @@ Converts IP addresses provided by my.location.ip to estimated locations """ -REQUIRES = ["git+https://github.com/purarue/ipgeocache"] +REQUIRES = ["git+https://github.com/seanbreckenridge/ipgeocache"] from dataclasses import dataclass from datetime import timedelta -from my.config import location from my.core import Stats, make_config +from my.config import location from my.core.warnings import medium @@ -24,13 +24,13 @@ class ip_config(location.via_ip): config = make_config(ip_config) -from collections.abc import Iterator from functools import lru_cache +from typing import Iterator, List from my.core import make_logger from my.core.compat import bisect_left from my.location.common import Location -from my.location.fallback.common import DateExact, FallbackLocation, _datetime_timestamp +from my.location.fallback.common import FallbackLocation, DateExact, _datetime_timestamp logger = make_logger(__name__, level="warning") @@ -60,7 +60,7 @@ def locations() -> Iterator[Location]: @lru_cache(1) -def _sorted_fallback_locations() -> list[FallbackLocation]: +def _sorted_fallback_locations() -> List[FallbackLocation]: fl = list(filter(lambda l: l.duration is not None, fallback_locations())) logger.debug(f"Fallback locations: {len(fl)}, sorting...:") fl.sort(key=lambda l: l.dt.timestamp()) diff --git a/my/location/google.py b/my/location/google.py index 750c847..b966ec6 100644 --- a/my/location/google.py +++ b/my/location/google.py @@ -3,27 +3,28 @@ Location data from Google Takeout DEPRECATED: setup my.google.takeout.parser and use my.location.google_takeout instead """ -from __future__ import annotations REQUIRES = [ 'geopy', # checking that coordinates are valid 'ijson', ] -import re -from collections.abc import Iterable, Sequence from datetime import datetime, timezone from itertools import islice from pathlib import Path -from subprocess import PIPE, Popen -from typing import IO, NamedTuple, Optional +from subprocess import Popen, PIPE +from typing import Iterable, NamedTuple, Optional, Sequence, IO, Tuple +import re # pip3 install geopy -import geopy # type: ignore +import geopy # type: ignore -from my.core import Stats, make_logger, stat, warnings +from my.core import stat, Stats, make_logger from my.core.cachew import cache_dir, mcachew +from my.core import warnings + + warnings.high("Please set up my.google.takeout.parser module for better takeout support") @@ -42,7 +43,7 @@ class Location(NamedTuple): alt: Optional[float] -TsLatLon = tuple[int, int, int] +TsLatLon = Tuple[int, int, int] def _iter_via_ijson(fo) -> Iterable[TsLatLon]: @@ -50,10 +51,10 @@ def _iter_via_ijson(fo) -> Iterable[TsLatLon]: # todo extract to common? try: # pip3 install ijson cffi - import ijson.backends.yajl2_cffi as ijson # type: ignore + import ijson.backends.yajl2_cffi as ijson # type: ignore except: warnings.medium("Falling back to default ijson because 'cffi' backend isn't found. It's up to 2x faster, you might want to check it out") - import ijson # type: ignore + import ijson # type: ignore for d in ijson.items(fo, 'locations.item'): yield ( diff --git a/my/location/google_takeout.py b/my/location/google_takeout.py index 8613257..eb757ce 100644 --- a/my/location/google_takeout.py +++ b/my/location/google_takeout.py @@ -2,16 +2,15 @@ Extracts locations using google_takeout_parser -- no shared code with the deprecated my.location.google """ -REQUIRES = ["git+https://github.com/purarue/google_takeout_parser"] +REQUIRES = ["git+https://github.com/seanbreckenridge/google_takeout_parser"] -from collections.abc import Iterator +from typing import Iterator +from my.google.takeout.parser import events, _cachew_depends_on from google_takeout_parser.models import Location as GoogleLocation -from my.core import LazyLogger, Stats, stat +from my.core import stat, Stats, LazyLogger from my.core.cachew import mcachew -from my.google.takeout.parser import _cachew_depends_on, events - from .common import Location logger = LazyLogger(__name__) diff --git a/my/location/google_takeout_semantic.py b/my/location/google_takeout_semantic.py index e84a932..5f2c055 100644 --- a/my/location/google_takeout_semantic.py +++ b/my/location/google_takeout_semantic.py @@ -5,26 +5,23 @@ Extracts semantic location history using google_takeout_parser # This is a separate module to prevent ImportError and a new config block from breaking # previously functional my.location.google_takeout locations -REQUIRES = ["git+https://github.com/purarue/google_takeout_parser"] +REQUIRES = ["git+https://github.com/seanbreckenridge/google_takeout_parser"] -from collections.abc import Iterator from dataclasses import dataclass +from typing import Iterator, List +from my.google.takeout.parser import events, _cachew_depends_on as _parser_cachew_depends_on from google_takeout_parser.models import PlaceVisit as SemanticLocation -from my.core import LazyLogger, Stats, make_config, stat +from my.core import make_config, stat, LazyLogger, Stats from my.core.cachew import mcachew from my.core.error import Res -from my.google.takeout.parser import _cachew_depends_on as _parser_cachew_depends_on -from my.google.takeout.parser import events - from .common import Location logger = LazyLogger(__name__) from my.config import location as user_config - @dataclass class semantic_locations_config(user_config.google_takeout_semantic): # a value between 0 and 100, 100 being the most confident @@ -39,7 +36,7 @@ config = make_config(semantic_locations_config) # add config to cachew dependency so it recomputes on config changes -def _cachew_depends_on() -> list[str]: +def _cachew_depends_on() -> List[str]: dep = _parser_cachew_depends_on() dep.insert(0, f"require_confidence={config.require_confidence} accuracy={config.accuracy}") return dep diff --git a/my/location/gpslogger.py b/my/location/gpslogger.py index bbbf70e..6d158a0 100644 --- a/my/location/gpslogger.py +++ b/my/location/gpslogger.py @@ -20,21 +20,21 @@ class config(location.gpslogger): accuracy: float = 50.0 -from collections.abc import Iterator, Sequence -from datetime import datetime, timezone from itertools import chain +from datetime import datetime, timezone from pathlib import Path +from typing import Iterator, Sequence, List import gpxpy from gpxpy.gpx import GPXXMLSyntaxException from more_itertools import unique_everseen -from my.core import LazyLogger, Stats +from my.core import Stats, LazyLogger from my.core.cachew import mcachew from my.core.common import get_files - from .common import Location + logger = LazyLogger(__name__, level="warning") def _input_sort_key(path: Path) -> str: @@ -49,7 +49,7 @@ def inputs() -> Sequence[Path]: return sorted(get_files(config.export_path, glob="*.gpx", sort=False), key=_input_sort_key) -def _cachew_depends_on() -> list[float]: +def _cachew_depends_on() -> List[float]: return [p.stat().st_mtime for p in inputs()] diff --git a/my/location/home.py b/my/location/home.py index c82dda7..f6e6978 100644 --- a/my/location/home.py +++ b/my/location/home.py @@ -1,7 +1,7 @@ -from my.core.warnings import high - from .fallback.via_home import * +from my.core.warnings import high + high( "my.location.home is deprecated, use my.location.fallback.via_home instead, or estimate locations using the higher-level my.location.fallback.all.estimate_location" ) diff --git a/my/location/via_ip.py b/my/location/via_ip.py index 240ec5f..df48f8b 100644 --- a/my/location/via_ip.py +++ b/my/location/via_ip.py @@ -1,7 +1,7 @@ -REQUIRES = ["git+https://github.com/purarue/ipgeocache"] - -from my.core.warnings import high +REQUIRES = ["git+https://github.com/seanbreckenridge/ipgeocache"] from .fallback.via_ip import * +from my.core.warnings import high + high("my.location.via_ip is deprecated, use my.location.fallback.via_ip instead") diff --git a/my/materialistic.py b/my/materialistic.py index 45af3f9..8a6a997 100644 --- a/my/materialistic.py +++ b/my/materialistic.py @@ -1,5 +1,4 @@ from .core.warnings import high - high("DEPRECATED! Please use my.hackernews.materialistic instead.") from .hackernews.materialistic import * diff --git a/my/media/imdb.py b/my/media/imdb.py index 131f6a7..df31032 100644 --- a/my/media/imdb.py +++ b/my/media/imdb.py @@ -1,12 +1,10 @@ import csv -from collections.abc import Iterator from datetime import datetime -from typing import NamedTuple +from typing import Iterator, List, NamedTuple -from my.core import get_files - -from my.config import imdb as config # isort: skip +from ..core import get_files +from my.config import imdb as config def _get_last(): return max(get_files(config.export_path)) @@ -33,7 +31,7 @@ def iter_movies() -> Iterator[Movie]: yield Movie(created=created, title=title, rating=rating) -def get_movies() -> list[Movie]: +def get_movies() -> List[Movie]: return sorted(iter_movies(), key=lambda m: m.created) diff --git a/my/media/youtube.py b/my/media/youtube.py index 9a38c43..3ddbc14 100644 --- a/my/media/youtube.py +++ b/my/media/youtube.py @@ -1,4 +1,4 @@ -from my.core import __NOT_HPI_MODULE__ # isort: skip +from my.core import __NOT_HPI_MODULE__ from typing import TYPE_CHECKING diff --git a/my/monzo/monzoexport.py b/my/monzo/monzoexport.py index f5e1cd1..3aa0cf5 100644 --- a/my/monzo/monzoexport.py +++ b/my/monzo/monzoexport.py @@ -5,17 +5,16 @@ REQUIRES = [ 'git+https://github.com/karlicoss/monzoexport', ] -from collections.abc import Iterator, Sequence from dataclasses import dataclass from pathlib import Path +from typing import Sequence, Iterator from my.core import ( Paths, get_files, make_logger, ) - -import my.config # isort: skip +import my.config @dataclass diff --git a/my/orgmode.py b/my/orgmode.py index 10f53c0..cf14e43 100644 --- a/my/orgmode.py +++ b/my/orgmode.py @@ -1,17 +1,15 @@ ''' Programmatic access and queries to org-mode files on the filesystem ''' -from __future__ import annotations REQUIRES = [ 'orgparse', ] import re -from collections.abc import Iterable, Sequence from datetime import datetime from pathlib import Path -from typing import NamedTuple, Optional +from typing import Iterable, List, NamedTuple, Optional, Sequence, Tuple import orgparse @@ -36,7 +34,7 @@ def make_config() -> config: class OrgNote(NamedTuple): created: Optional[datetime] heading: str - tags: list[str] + tags: List[str] def inputs() -> Sequence[Path]: @@ -47,7 +45,7 @@ def inputs() -> Sequence[Path]: _rgx = re.compile(orgparse.date.gene_timestamp_regex(brtype='inactive'), re.VERBOSE) -def _created(n: orgparse.OrgNode) -> tuple[datetime | None, str]: +def _created(n: orgparse.OrgNode) -> Tuple[Optional[datetime], str]: heading = n.heading # meh.. support in orgparse? pp = {} if n.is_root() else n.properties @@ -70,7 +68,7 @@ def _created(n: orgparse.OrgNode) -> tuple[datetime | None, str]: def to_note(x: orgparse.OrgNode) -> OrgNote: # ugh. hack to merely make it cacheable heading = x.heading - created: datetime | None + created: Optional[datetime] try: c, heading = _created(x) if isinstance(c, datetime): diff --git a/my/pdfs.py b/my/pdfs.py index eefd573..de9324d 100644 --- a/my/pdfs.py +++ b/my/pdfs.py @@ -1,7 +1,6 @@ ''' PDF documents and annotations on your filesystem ''' -from __future__ import annotations as _annotations REQUIRES = [ 'git+https://github.com/0xabu/pdfannots', @@ -9,10 +8,9 @@ REQUIRES = [ ] import time -from collections.abc import Iterator, Sequence from datetime import datetime from pathlib import Path -from typing import TYPE_CHECKING, NamedTuple, Optional, Protocol +from typing import Iterator, List, NamedTuple, Optional, Protocol, Sequence, TYPE_CHECKING import pdfannots from more_itertools import bucket @@ -74,7 +72,7 @@ class Annotation(NamedTuple): created: Optional[datetime] # note: can be tz unaware in some bad pdfs... @property - def date(self) -> datetime | None: + def date(self) -> Optional[datetime]: # legacy name return self.created @@ -95,7 +93,7 @@ def _as_annotation(*, raw: pdfannots.Annotation, path: str) -> Annotation: ) -def get_annots(p: Path) -> list[Annotation]: +def get_annots(p: Path) -> List[Annotation]: b = time.time() with p.open('rb') as fo: doc = pdfannots.process_file(fo, emit_progress_to=None) @@ -152,17 +150,17 @@ class Pdf(NamedTuple): annotations: Sequence[Annotation] @property - def created(self) -> datetime | None: + def created(self) -> Optional[datetime]: annots = self.annotations return None if len(annots) == 0 else annots[-1].created @property - def date(self) -> datetime | None: + def date(self) -> Optional[datetime]: # legacy return self.created -def annotated_pdfs(*, filelist: Sequence[PathIsh] | None = None) -> Iterator[Res[Pdf]]: +def annotated_pdfs(*, filelist: Optional[Sequence[PathIsh]] = None) -> Iterator[Res[Pdf]]: if filelist is not None: # hacky... keeping it backwards compatible # https://github.com/karlicoss/HPI/pull/74 diff --git a/my/photos/main.py b/my/photos/main.py index f98cb15..bf912e4 100644 --- a/my/photos/main.py +++ b/my/photos/main.py @@ -1,30 +1,27 @@ """ Photos and videos on your filesystem, their GPS and timestamps """ - -from __future__ import annotations - REQUIRES = [ 'geopy', 'magic', ] # NOTE: also uses fdfind to search photos -import json -from collections.abc import Iterable, Iterator from concurrent.futures import ProcessPoolExecutor as Pool from datetime import datetime +import json from pathlib import Path -from typing import NamedTuple, Optional +from typing import Optional, NamedTuple, Iterator, Iterable, List from geopy.geocoders import Nominatim # type: ignore from my.core import LazyLogger -from my.core.cachew import cache_dir, mcachew from my.core.error import Res, sort_res_by +from my.core.cachew import cache_dir, mcachew from my.core.mime import fastermime -from my.config import photos as config # type: ignore[attr-defined] # isort: skip +from my.config import photos as config # type: ignore[attr-defined] + logger = LazyLogger(__name__) @@ -58,15 +55,15 @@ class Photo(NamedTuple): return f'{config.base_url}{self._basename}' -from .utils import Exif, ExifTags, convert_ref, dt_from_path, get_exif_from_file +from .utils import get_exif_from_file, ExifTags, Exif, dt_from_path, convert_ref Result = Res[Photo] -def _make_photo_aux(*args, **kwargs) -> list[Result]: +def _make_photo_aux(*args, **kwargs) -> List[Result]: # for the process pool.. return list(_make_photo(*args, **kwargs)) -def _make_photo(photo: Path, mtype: str, *, parent_geo: LatLon | None) -> Iterator[Result]: +def _make_photo(photo: Path, mtype: str, *, parent_geo: Optional[LatLon]) -> Iterator[Result]: exif: Exif if any(x in mtype for x in ['image/png', 'image/x-ms-bmp', 'video']): # TODO don't remember why.. @@ -80,7 +77,7 @@ def _make_photo(photo: Path, mtype: str, *, parent_geo: LatLon | None) -> Iterat yield e exif = {} - def _get_geo() -> LatLon | None: + def _get_geo() -> Optional[LatLon]: meta = exif.get(ExifTags.GPSINFO, {}) if ExifTags.LAT in meta and ExifTags.LON in meta: return LatLon( @@ -90,7 +87,7 @@ def _make_photo(photo: Path, mtype: str, *, parent_geo: LatLon | None) -> Iterat return parent_geo # TODO aware on unaware? - def _get_dt() -> datetime | None: + def _get_dt() -> Optional[datetime]: edt = exif.get(ExifTags.DATETIME, None) if edt is not None: dtimes = edt.replace(' 24', ' 00') # jeez maybe log it? @@ -126,7 +123,7 @@ def _make_photo(photo: Path, mtype: str, *, parent_geo: LatLon | None) -> Iterat def _candidates() -> Iterable[Res[str]]: # TODO that could be a bit slow if there are to many extra files? - from subprocess import PIPE, Popen + from subprocess import Popen, PIPE # TODO could extract this to common? # TODO would be nice to reuse get_files (or even let it use find) # that way would be easier to exclude @@ -165,7 +162,7 @@ def _photos(candidates: Iterable[Res[str]]) -> Iterator[Result]: from functools import lru_cache @lru_cache(None) - def get_geo(d: Path) -> LatLon | None: + def get_geo(d: Path) -> Optional[LatLon]: geof = d / 'geo.json' if not geof.exists(): if d == d.parent: @@ -217,7 +214,5 @@ def print_all() -> None: # todo cachew -- invalidate if function code changed? from ..core import Stats, stat - - def stats() -> Stats: return stat(photos) diff --git a/my/photos/utils.py b/my/photos/utils.py index e88def2..c614c4a 100644 --- a/my/photos/utils.py +++ b/my/photos/utils.py @@ -1,13 +1,11 @@ -from __future__ import annotations - -from ..core import __NOT_HPI_MODULE__ # isort: skip - from pathlib import Path +from typing import Dict import PIL.Image -from PIL.ExifTags import GPSTAGS, TAGS +from PIL.ExifTags import TAGS, GPSTAGS -Exif = dict + +Exif = Dict # TODO PIL.ExifTags.TAGS @@ -64,15 +62,18 @@ def convert_ref(cstr, ref: str) -> float: import re from datetime import datetime +from typing import Optional # TODO surely there is a library that does it?? # TODO this belongs to a private overlay or something # basically have a function that patches up dates after the files were yielded.. _DT_REGEX = re.compile(r'\D(\d{8})\D*(\d{6})\D') -def dt_from_path(p: Path) -> datetime | None: +def dt_from_path(p: Path) -> Optional[datetime]: name = p.stem mm = _DT_REGEX.search(name) if mm is None: return None dates = mm.group(1) + mm.group(2) return datetime.strptime(dates, "%Y%m%d%H%M%S") + +from ..core import __NOT_HPI_MODULE__ diff --git a/my/pinboard.py b/my/pinboard.py index e98dc78..ef4ca36 100644 --- a/my/pinboard.py +++ b/my/pinboard.py @@ -5,16 +5,15 @@ REQUIRES = [ 'git+https://github.com/karlicoss/pinbexport', ] -from collections.abc import Iterator, Sequence from dataclasses import dataclass from pathlib import Path +from typing import Iterator, Sequence + +from my.core import get_files, Paths, Res +import my.config import pinbexport.dal as pinbexport -from my.core import Paths, Res, get_files - -import my.config # isort: skip - @dataclass class config(my.config.pinboard): # TODO rename to pinboard.pinbexport? diff --git a/my/pocket.py b/my/pocket.py index ff9a788..b638fba 100644 --- a/my/pocket.py +++ b/my/pocket.py @@ -7,10 +7,10 @@ REQUIRES = [ from dataclasses import dataclass from typing import TYPE_CHECKING -from my.config import pocket as user_config - from .core import Paths +from my.config import pocket as user_config + @dataclass class pocket(user_config): @@ -23,7 +23,6 @@ class pocket(user_config): from .core.cfg import make_config - config = make_config(pocket) @@ -38,7 +37,7 @@ except ModuleNotFoundError as e: Article = dal.Article -from collections.abc import Iterable, Sequence +from typing import Sequence, Iterable # todo not sure if should be defensive against empty? @@ -52,12 +51,9 @@ def articles() -> Iterable[Article]: yield from _dal().articles() -from .core import Stats, stat - - +from .core import stat, Stats def stats() -> Stats: from itertools import chain - from more_itertools import ilen return { **stat(articles), diff --git a/my/polar.py b/my/polar.py index 2172014..e52bb14 100644 --- a/my/polar.py +++ b/my/polar.py @@ -1,12 +1,11 @@ """ [[https://github.com/burtonator/polar-bookshelf][Polar]] articles and highlights """ -from __future__ import annotations - from pathlib import Path -from typing import TYPE_CHECKING, cast +from typing import cast, TYPE_CHECKING -import my.config # isort: skip + +import my.config # todo use something similar to tz.via_location for config fallback if not TYPE_CHECKING: @@ -21,11 +20,8 @@ if user_config is None: pass -from dataclasses import dataclass - from .core import PathIsh - - +from dataclasses import dataclass @dataclass class polar(user_config): ''' @@ -36,21 +32,20 @@ class polar(user_config): from .core import make_config - config = make_config(polar) # todo not sure where it keeps stuff on Windows? # https://github.com/burtonator/polar-bookshelf/issues/296 -import json -from collections.abc import Iterable, Sequence from datetime import datetime -from typing import NamedTuple +from typing import List, Dict, Iterable, NamedTuple, Sequence, Optional +import json -from .core import Json, LazyLogger, Res +from .core import LazyLogger, Json, Res from .core.compat import fromisoformat from .core.error import echain, sort_res_by -from .core.konsume import Wdict, Zoomable, wrap +from .core.konsume import wrap, Zoomable, Wdict + logger = LazyLogger(__name__) @@ -70,7 +65,7 @@ class Highlight(NamedTuple): comments: Sequence[Comment] tags: Sequence[str] page: int # 1-indexed - color: str | None = None + color: Optional[str] = None Uid = str @@ -78,7 +73,7 @@ class Book(NamedTuple): created: datetime uid: Uid path: Path - title: str | None + title: Optional[str] # TODO hmmm. I think this needs to be defensive as well... # think about it later. items: Sequence[Highlight] @@ -134,7 +129,7 @@ class Loader: pi['dimensions'].consume_all() # TODO how to make it nicer? - cmap: dict[Hid, list[Comment]] = {} + cmap: Dict[Hid, List[Comment]] = {} vals = list(comments) for v in vals: cid = v['id'].zoom() @@ -168,7 +163,7 @@ class Loader: h['rects'].ignore() # TODO make it more generic.. - htags: list[str] = [] + htags: List[str] = [] if 'tags' in h: ht = h['tags'].zoom() for _k, v in list(ht.items()): @@ -247,7 +242,7 @@ def iter_entries() -> Iterable[Result]: yield err -def get_entries() -> list[Result]: +def get_entries() -> List[Result]: # sorting by first annotation is reasonable I guess??? # todo perhaps worth making it a pattern? X() returns iterable, get_X returns reasonably sorted list? return list(sort_res_by(iter_entries(), key=lambda e: e.created)) diff --git a/my/reddit/__init__.py b/my/reddit/__init__.py index 982901a..e81aaf9 100644 --- a/my/reddit/__init__.py +++ b/my/reddit/__init__.py @@ -9,7 +9,7 @@ since that allows for easier overriding using namespace packages See https://github.com/karlicoss/HPI/blob/master/doc/MODULE_DESIGN.org#allpy for more info. """ -# prevent it from appearing in modules list/doctor +# prevent it from apprearing in modules list/doctor from ..core import __NOT_HPI_MODULE__ # kinda annoying to keep it, but it's so legacy 'hpi module install my.reddit' works @@ -20,7 +20,6 @@ REQUIRES = [ from my.core.hpi_compat import handle_legacy_import - is_legacy_import = handle_legacy_import( parent_module_name=__name__, legacy_submodule_name='rexport', diff --git a/my/reddit/all.py b/my/reddit/all.py index 27e22df..daedba1 100644 --- a/my/reddit/all.py +++ b/my/reddit/all.py @@ -1,9 +1,8 @@ -from collections.abc import Iterator - -from my.core import Stats, stat +from typing import Iterator +from my.core import stat, Stats from my.core.source import import_source -from .common import Comment, Save, Submission, Upvote, _merge_comments +from .common import Save, Upvote, Comment, Submission, _merge_comments # Man... ideally an all.py file isn't this verbose, but # reddit just feels like that much of a complicated source and diff --git a/my/reddit/common.py b/my/reddit/common.py index 40f9f6e..c01258b 100644 --- a/my/reddit/common.py +++ b/my/reddit/common.py @@ -2,14 +2,12 @@ This defines Protocol classes, which make sure that each different type of shared models have a standardized interface """ +from my.core import __NOT_HPI_MODULE__ -from my.core import __NOT_HPI_MODULE__ # isort: skip - -from collections.abc import Iterator +from typing import Set, Iterator, Protocol from itertools import chain -from typing import Protocol -from my.core import Json, datetime_aware +from my.core import datetime_aware, Json # common fields across all the Protocol classes, so generic code can be written @@ -51,7 +49,7 @@ class Submission(RedditBase, Protocol): def _merge_comments(*sources: Iterator[Comment]) -> Iterator[Comment]: #from .rexport import logger #ignored = 0 - emitted: set[str] = set() + emitted: Set[str] = set() for e in chain(*sources): uid = e.id if uid in emitted: diff --git a/my/reddit/pushshift.py b/my/reddit/pushshift.py index 12f592b..9580005 100644 --- a/my/reddit/pushshift.py +++ b/my/reddit/pushshift.py @@ -1,27 +1,27 @@ """ Gives you access to older comments possibly not accessible with rexport using pushshift -See https://github.com/purarue/pushshift_comment_export +See https://github.com/seanbreckenridge/pushshift_comment_export """ REQUIRES = [ - "git+https://github.com/purarue/pushshift_comment_export", + "git+https://github.com/seanbreckenridge/pushshift_comment_export", ] from dataclasses import dataclass -# note: keeping pushshift import before config import, so it's handled gracefully by import_source -from pushshift_comment_export.dal import PComment, read_file - -from my.config import reddit as uconfig from my.core import Paths, Stats, stat from my.core.cfg import make_config +# note: keeping pushshift import before config import, so it's handled gracefully by import_source +from pushshift_comment_export.dal import read_file, PComment + +from my.config import reddit as uconfig @dataclass class pushshift_config(uconfig.pushshift): ''' - Uses [[https://github.com/purarue/pushshift_comment_export][pushshift]] to get access to old comments + Uses [[https://github.com/seanbreckenridge/pushshift_comment_export][pushshift]] to get access to old comments ''' # path[s]/glob to the exported JSON data @@ -29,10 +29,10 @@ class pushshift_config(uconfig.pushshift): config = make_config(pushshift_config) -from collections.abc import Iterator, Sequence +from my.core import get_files +from typing import Sequence, Iterator from pathlib import Path -from my.core import get_files def inputs() -> Sequence[Path]: diff --git a/my/reddit/rexport.py b/my/reddit/rexport.py index 262635b..5dcd7d9 100644 --- a/my/reddit/rexport.py +++ b/my/reddit/rexport.py @@ -7,24 +7,23 @@ REQUIRES = [ 'git+https://github.com/karlicoss/rexport', ] -import inspect -from collections.abc import Iterator, Sequence from dataclasses import dataclass +import inspect from pathlib import Path -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Iterator, Sequence from my.core import ( - Paths, - Stats, get_files, make_logger, - stat, warnings, + stat, + Paths, + Stats, ) from my.core.cachew import mcachew -from my.core.cfg import Attrs, make_config +from my.core.cfg import make_config, Attrs -from my.config import reddit as uconfig # isort: skip +from my.config import reddit as uconfig logger = make_logger(__name__) @@ -146,7 +145,7 @@ if not TYPE_CHECKING: # here we just check that types are available, we don't actually want to import them # fmt: off dal.Subreddit # noqa: B018 - dal.Profile # noqa: B018 + dal.Profil # noqa: B018e dal.Multireddit # noqa: B018 # fmt: on except AttributeError as ae: diff --git a/my/rescuetime.py b/my/rescuetime.py index 0c9fd28..76a0d4c 100644 --- a/my/rescuetime.py +++ b/my/rescuetime.py @@ -5,15 +5,16 @@ REQUIRES = [ 'git+https://github.com/karlicoss/rescuexport', ] -from collections.abc import Iterable, Sequence -from datetime import timedelta from pathlib import Path +from datetime import timedelta +from typing import Sequence, Iterable -from my.core import Stats, get_files, make_logger, stat +from my.core import get_files, make_logger, stat, Stats from my.core.cachew import mcachew from my.core.error import Res, split_errors -from my.config import rescuetime as config # isort: skip +from my.config import rescuetime as config + logger = make_logger(__name__) @@ -23,7 +24,6 @@ def inputs() -> Sequence[Path]: import rescuexport.dal as dal - DAL = dal.DAL Entry = dal.Entry @@ -43,8 +43,6 @@ def groups(gap: timedelta=timedelta(hours=3)) -> Iterable[Res[Sequence[Entry]]]: # todo automatic dataframe interface? from .core.pandas import DataFrameT, as_dataframe - - def dataframe() -> DataFrameT: return as_dataframe(entries()) @@ -58,19 +56,16 @@ def stats() -> Stats: # basically, hack config and populate it with fake data? fake data generated by DAL, but the rest is handled by this? -from collections.abc import Iterator from contextlib import contextmanager - - +from typing import Iterator # todo take seed, or what? @contextmanager def fake_data(rows: int=1000) -> Iterator: # todo also disable cachew automatically for such things? - import json - from tempfile import TemporaryDirectory - - from my.core.cachew import disabled_cachew from my.core.cfg import tmp_config + from my.core.cachew import disabled_cachew + from tempfile import TemporaryDirectory + import json with disabled_cachew(), TemporaryDirectory() as td: tdir = Path(td) f = tdir / 'rescuetime.json' diff --git a/my/roamresearch.py b/my/roamresearch.py index 7322774..2fe06d4 100644 --- a/my/roamresearch.py +++ b/my/roamresearch.py @@ -1,19 +1,16 @@ """ [[https://roamresearch.com][Roam]] data """ -from __future__ import annotations - -import re -from collections.abc import Iterator from datetime import datetime, timezone -from itertools import chain from pathlib import Path -from typing import NamedTuple +from itertools import chain +import re +from typing import NamedTuple, Iterator, List, Optional + +from .core import get_files, LazyLogger, Json from my.config import roamresearch as config -from .core import Json, LazyLogger, get_files - logger = LazyLogger(__name__) @@ -60,15 +57,15 @@ class Node(NamedTuple): return datetime.fromtimestamp(rt / 1000, tz=timezone.utc) @property - def title(self) -> str | None: + def title(self) -> Optional[str]: return self.raw.get(Keys.TITLE) @property - def body(self) -> str | None: + def body(self) -> Optional[str]: return self.raw.get(Keys.STRING) @property - def children(self) -> list[Node]: + def children(self) -> List['Node']: # TODO cache? needs a key argument (because of Json) ch = self.raw.get(Keys.CHILDREN, []) return list(map(Node, ch)) @@ -98,7 +95,7 @@ class Node(NamedTuple): # - heading -- notes that haven't been created yet return len(self.body or '') == 0 and len(self.children) == 0 - def traverse(self) -> Iterator[Node]: + def traverse(self) -> Iterator['Node']: # not sure about __iter__, because might be a bit unintuitive that it's recursive.. yield self for c in self.children: @@ -123,7 +120,7 @@ class Node(NamedTuple): return f'Node(created={self.created}, title={self.title}, body={self.body})' @staticmethod - def make(raw: Json) -> Iterator[Node]: + def make(raw: Json) -> Iterator['Node']: is_empty = set(raw.keys()) == {Keys.EDITED, Keys.EDIT_EMAIL, Keys.TITLE} # not sure about that... but daily notes end up like that if is_empty: @@ -133,11 +130,11 @@ class Node(NamedTuple): class Roam: - def __init__(self, raw: list[Json]) -> None: + def __init__(self, raw: List[Json]) -> None: self.raw = raw @property - def notes(self) -> list[Node]: + def notes(self) -> List[Node]: return list(chain.from_iterable(map(Node.make, self.raw))) def traverse(self) -> Iterator[Node]: diff --git a/my/rss/all.py b/my/rss/all.py index e10e4d2..b4dbdbd 100644 --- a/my/rss/all.py +++ b/my/rss/all.py @@ -3,9 +3,9 @@ Unified RSS data, merged from different services I used historically ''' # NOTE: you can comment out the sources you're not using -from collections.abc import Iterable - from . import feedbin, feedly + +from typing import Iterable from .common import Subscription, compute_subscriptions diff --git a/my/rss/common.py b/my/rss/common.py index bf9506e..bb75297 100644 --- a/my/rss/common.py +++ b/my/rss/common.py @@ -1,12 +1,10 @@ -from __future__ import annotations +from my.core import __NOT_HPI_MODULE__ -from my.core import __NOT_HPI_MODULE__ # isort: skip - -from collections.abc import Iterable, Sequence from dataclasses import dataclass, replace from itertools import chain +from typing import Optional, List, Dict, Iterable, Tuple, Sequence -from my.core import datetime_aware, warn_if_empty +from my.core import warn_if_empty, datetime_aware @dataclass @@ -15,16 +13,16 @@ class Subscription: url: str id: str # TODO not sure about it... # eh, not all of them got reasonable 'created' time - created_at: datetime_aware | None + created_at: Optional[datetime_aware] subscribed: bool = True # snapshot of subscriptions at time -SubscriptionState = tuple[datetime_aware, Sequence[Subscription]] +SubscriptionState = Tuple[datetime_aware, Sequence[Subscription]] @warn_if_empty -def compute_subscriptions(*sources: Iterable[SubscriptionState]) -> list[Subscription]: +def compute_subscriptions(*sources: Iterable[SubscriptionState]) -> List[Subscription]: """ Keeps track of everything I ever subscribed to. In addition, keeps track of unsubscribed as well (so you'd remember when and why you unsubscribed) @@ -32,7 +30,7 @@ def compute_subscriptions(*sources: Iterable[SubscriptionState]) -> list[Subscri states = list(chain.from_iterable(sources)) # TODO keep 'source'/'provider'/'service' attribute? - by_url: dict[str, Subscription] = {} + by_url: Dict[str, Subscription] = {} # ah. dates are used for sorting for _when, state in sorted(states): # TODO use 'when'? diff --git a/my/rss/feedbin.py b/my/rss/feedbin.py index 5f4da0a..dc13a17 100644 --- a/my/rss/feedbin.py +++ b/my/rss/feedbin.py @@ -3,15 +3,15 @@ Feedbin RSS reader """ import json -from collections.abc import Iterator, Sequence from pathlib import Path +from typing import Iterator, Sequence -from my.core import Stats, get_files, stat +from my.core import get_files, stat, Stats from my.core.compat import fromisoformat - from .common import Subscription, SubscriptionState -from my.config import feedbin as config # isort: skip +from my.config import feedbin as config + def inputs() -> Sequence[Path]: return get_files(config.export_path) diff --git a/my/rss/feedly.py b/my/rss/feedly.py index 9bf5429..127ef61 100644 --- a/my/rss/feedly.py +++ b/my/rss/feedly.py @@ -4,10 +4,9 @@ Feedly RSS reader import json from abc import abstractmethod -from collections.abc import Iterator, Sequence from datetime import datetime, timezone from pathlib import Path -from typing import Protocol +from typing import Iterator, Protocol, Sequence from my.core import Paths, get_files diff --git a/my/rtm.py b/my/rtm.py index 217c969..b559ba4 100644 --- a/my/rtm.py +++ b/my/rtm.py @@ -6,19 +6,21 @@ REQUIRES = [ 'icalendar', ] -import re -from collections.abc import Iterator from datetime import datetime from functools import cached_property +import re +from typing import Dict, List, Iterator -import icalendar # type: ignore -from icalendar.cal import Todo # type: ignore -from more_itertools import bucket - -from my.core import get_files, make_logger +from my.core import make_logger, get_files from my.core.utils.itertools import make_dict -from my.config import rtm as config # isort: skip +from my.config import rtm as config + + +from more_itertools import bucket +import icalendar # type: ignore +from icalendar.cal import Todo # type: ignore + logger = make_logger(__name__) @@ -30,14 +32,14 @@ class MyTodo: self.revision = revision @cached_property - def notes(self) -> list[str]: + def notes(self) -> List[str]: # TODO can there be multiple?? desc = self.todo['DESCRIPTION'] notes = re.findall(r'---\n\n(.*?)\n\nUpdated:', desc, flags=re.DOTALL) return notes @cached_property - def tags(self) -> list[str]: + def tags(self) -> List[str]: desc = self.todo['DESCRIPTION'] [tags_str] = re.findall(r'\nTags: (.*?)\n', desc, flags=re.DOTALL) if tags_str == 'none': @@ -90,11 +92,11 @@ class DAL: for t in self.cal.walk('VTODO'): yield MyTodo(t, self.revision) - def get_todos_by_uid(self) -> dict[str, MyTodo]: + def get_todos_by_uid(self) -> Dict[str, MyTodo]: todos = self.all_todos() return make_dict(todos, key=lambda t: t.uid) - def get_todos_by_title(self) -> dict[str, list[MyTodo]]: + def get_todos_by_title(self) -> Dict[str, List[MyTodo]]: todos = self.all_todos() bucketed = bucket(todos, lambda todo: todo.title) return {k: list(bucketed[k]) for k in bucketed} diff --git a/my/runnerup.py b/my/runnerup.py index f5d7d1e..a21075a 100644 --- a/my/runnerup.py +++ b/my/runnerup.py @@ -6,15 +6,17 @@ REQUIRES = [ 'python-tcxparser', ] -from collections.abc import Iterable from datetime import timedelta from pathlib import Path +from typing import Iterable + +from my.core import Res, get_files, Json +from my.core.compat import fromisoformat import tcxparser # type: ignore[import-untyped] from my.config import runnerup as config -from my.core import Json, Res, get_files -from my.core.compat import fromisoformat + # TODO later, use a proper namedtuple? Workout = Json @@ -68,8 +70,6 @@ def workouts() -> Iterable[Res[Workout]]: from .core.pandas import DataFrameT, check_dataframe, error_to_row - - @check_dataframe def dataframe() -> DataFrameT: def it(): @@ -85,8 +85,6 @@ def dataframe() -> DataFrameT: return df -from .core import Stats, stat - - +from .core import stat, Stats def stats() -> Stats: return stat(dataframe) diff --git a/my/simple.py b/my/simple.py index b7f25cd..7462291 100644 --- a/my/simple.py +++ b/my/simple.py @@ -1,11 +1,12 @@ ''' Just a demo module for testing and documentation purposes ''' -from collections.abc import Iterator from dataclasses import dataclass +from typing import Iterator + +from my.core import make_config from my.config import simple as user_config -from my.core import make_config @dataclass diff --git a/my/smscalls.py b/my/smscalls.py index 27d08be..78bf7ee 100644 --- a/my/smscalls.py +++ b/my/smscalls.py @@ -2,7 +2,6 @@ Phone calls and SMS messages Exported using https://play.google.com/store/apps/details?id=com.riteshsahu.SMSBackupRestore&hl=en_US """ -from __future__ import annotations # See: https://www.synctech.com.au/sms-backup-restore/fields-in-xml-backup-files/ for schema @@ -10,9 +9,8 @@ REQUIRES = ['lxml'] from dataclasses import dataclass +from my.core import get_files, stat, Paths, Stats from my.config import smscalls as user_config -from my.core import Paths, Stats, get_files, stat - @dataclass class smscalls(user_config): @@ -20,13 +18,11 @@ class smscalls(user_config): export_path: Paths from my.core.cfg import make_config - config = make_config(smscalls) -from collections.abc import Iterator from datetime import datetime, timezone from pathlib import Path -from typing import Any, NamedTuple +from typing import NamedTuple, Iterator, Set, Tuple, Optional, Any, Dict, List import lxml.etree as etree @@ -37,8 +33,7 @@ class Call(NamedTuple): dt: datetime dt_readable: str duration_s: int - phone_number: str - who: str | None + who: Optional[str] # type - 1 = Incoming, 2 = Outgoing, 3 = Missed, 4 = Voicemail, 5 = Rejected, 6 = Refused List. call_type: int @@ -55,27 +50,23 @@ class Call(NamedTuple): # All the field values are read as-is from the underlying database and no conversion is done by the app in most cases. # # The '(Unknown)' is just what my android phone does, not sure if there are others -UNKNOWN: set[str] = {'(Unknown)'} - -def _parse_xml(xml: Path) -> Any: - return etree.parse(str(xml), parser=etree.XMLParser(huge_tree=True)) +UNKNOWN: Set[str] = {'(Unknown)'} def _extract_calls(path: Path) -> Iterator[Res[Call]]: - tr = _parse_xml(path) + tr = etree.parse(str(path)) for cxml in tr.findall('call'): dt = cxml.get('date') dt_readable = cxml.get('readable_date') duration = cxml.get('duration') who = cxml.get('contact_name') call_type = cxml.get('type') - number = cxml.get('number') # if name is missing, its not None (its some string), depends on the phone/message app if who is not None and who in UNKNOWN: who = None - if dt is None or dt_readable is None or duration is None or call_type is None or number is None: + if dt is None or dt_readable is None or duration is None or call_type is None: call_str = etree.tostring(cxml).decode('utf-8') - yield RuntimeError(f"Missing one or more required attributes [date, readable_date, duration, type, number] in {call_str}") + yield RuntimeError(f"Missing one or more required attributes [date, readable_date, duration, type] in {call_str}") continue # TODO we've got local tz here, not sure if useful.. # ok, so readable date is local datetime, changing throughout the backup @@ -83,7 +74,6 @@ def _extract_calls(path: Path) -> Iterator[Res[Call]]: dt=_parse_dt_ms(dt), dt_readable=dt_readable, duration_s=int(duration), - phone_number=number, who=who, call_type=int(call_type), ) @@ -93,7 +83,7 @@ def calls() -> Iterator[Res[Call]]: files = get_files(config.export_path, glob='calls-*.xml') # TODO always replacing with the latter is good, we get better contact names?? - emitted: set[datetime] = set() + emitted: Set[datetime] = set() for p in files: for c in _extract_calls(p): if isinstance(c, Exception): @@ -108,7 +98,7 @@ def calls() -> Iterator[Res[Call]]: class Message(NamedTuple): dt: datetime dt_readable: str - who: str | None + who: Optional[str] message: str phone_number: str # type - 1 = Received, 2 = Sent, 3 = Draft, 4 = Outbox, 5 = Failed, 6 = Queued @@ -122,7 +112,7 @@ class Message(NamedTuple): def messages() -> Iterator[Res[Message]]: files = get_files(config.export_path, glob='sms-*.xml') - emitted: set[tuple[datetime, str | None, bool]] = set() + emitted: Set[Tuple[datetime, Optional[str], bool]] = set() for p in files: for c in _extract_messages(p): if isinstance(c, Exception): @@ -136,7 +126,7 @@ def messages() -> Iterator[Res[Message]]: def _extract_messages(path: Path) -> Iterator[Res[Message]]: - tr = _parse_xml(path) + tr = etree.parse(str(path)) for mxml in tr.findall('sms'): dt = mxml.get('date') dt_readable = mxml.get('readable_date') @@ -165,20 +155,20 @@ class MMSContentPart(NamedTuple): sequence_index: int content_type: str filename: str - text: str | None - data: str | None + text: Optional[str] + data: Optional[str] class MMS(NamedTuple): dt: datetime dt_readable: str - parts: list[MMSContentPart] + parts: List[MMSContentPart] # NOTE: these is often something like 'Name 1, Name 2', but might be different depending on your client - who: str | None + who: Optional[str] # NOTE: This can be a single phone number, or multiple, split by '~' or ','. Its better to think # of this as a 'key' or 'conversation ID', phone numbers are also present in 'addresses' phone_number: str - addresses: list[tuple[str, int]] + addresses: List[Tuple[str, int]] # 1 = Received, 2 = Sent, 3 = Draft, 4 = Outbox message_type: int @@ -192,7 +182,7 @@ class MMS(NamedTuple): for (addr, _type) in self.addresses: if _type == 137: return addr - # hmm, maybe return instead? but this probably shouldn't happen, means + # hmm, maybe return instead? but this probably shouldnt happen, means # something is very broken raise RuntimeError(f'No from address matching 137 found in {self.addresses}') @@ -204,7 +194,7 @@ class MMS(NamedTuple): def mms() -> Iterator[Res[MMS]]: files = get_files(config.export_path, glob='sms-*.xml') - emitted: set[tuple[datetime, str | None, str]] = set() + emitted: Set[Tuple[datetime, Optional[str], str]] = set() for p in files: for c in _extract_mms(p): if isinstance(c, Exception): @@ -217,10 +207,10 @@ def mms() -> Iterator[Res[MMS]]: yield c -def _resolve_null_str(value: str | None) -> str | None: +def _resolve_null_str(value: Optional[str]) -> Optional[str]: if value is None: return None - # hmm.. there's some risk of the text actually being 'null', but there's + # hmm.. theres some risk of the text actually being 'null', but theres # no way to distinguish that from XML values if value == 'null': return None @@ -228,7 +218,8 @@ def _resolve_null_str(value: str | None) -> str | None: def _extract_mms(path: Path) -> Iterator[Res[MMS]]: - tr = _parse_xml(path) + tr = etree.parse(str(path)) + for mxml in tr.findall('mms'): dt = mxml.get('date') dt_readable = mxml.get('readable_date') @@ -244,7 +235,7 @@ def _extract_mms(path: Path) -> Iterator[Res[MMS]]: yield RuntimeError(f'Missing one or more required attributes [date, readable_date, msg_box, address] in {mxml_str}') continue - addresses: list[tuple[str, int]] = [] + addresses: List[Tuple[str, int]] = [] for addr_parent in mxml.findall('addrs'): for addr in addr_parent.findall('addr'): addr_data = addr.attrib @@ -259,7 +250,7 @@ def _extract_mms(path: Path) -> Iterator[Res[MMS]]: continue addresses.append((user_address, int(user_type))) - content: list[MMSContentPart] = [] + content: List[MMSContentPart] = [] for part_root in mxml.findall('parts'): @@ -273,8 +264,11 @@ def _extract_mms(path: Path) -> Iterator[Res[MMS]]: # # This seems pretty useless, so we should try and skip it, and just return the # text/images/data - part_data: dict[str, Any] = part.attrib - seq: str | None = part_data.get('seq') + # + # man, attrib is some internal cpython ._Attrib type which can't + # be typed by any sort of mappingproxy. maybe a protocol could work..? + part_data: Dict[str, Any] = part.attrib # type: ignore + seq: Optional[str] = part_data.get('seq') if seq == '-1': continue @@ -282,13 +276,13 @@ def _extract_mms(path: Path) -> Iterator[Res[MMS]]: yield RuntimeError(f'seq must be a number, was seq={seq} {type(seq)} in {part_data}') continue - charset_type: str | None = _resolve_null_str(part_data.get('ct')) - filename: str | None = _resolve_null_str(part_data.get('name')) + charset_type: Optional[str] = _resolve_null_str(part_data.get('ct')) + filename: Optional[str] = _resolve_null_str(part_data.get('name')) # in some cases (images, cards), the filename is set in 'cl' instead if filename is None: filename = _resolve_null_str(part_data.get('cl')) - text: str | None = _resolve_null_str(part_data.get('text')) - data: str | None = _resolve_null_str(part_data.get('data')) + text: Optional[str] = _resolve_null_str(part_data.get('text')) + data: Optional[str] = _resolve_null_str(part_data.get('data')) if charset_type is None or filename is None or (text is None and data is None): yield RuntimeError(f'Missing one or more required attributes [ct, name, (text, data)] must be present in {part_data}') diff --git a/my/stackexchange/gdpr.py b/my/stackexchange/gdpr.py index 8ed0d30..5292bef 100644 --- a/my/stackexchange/gdpr.py +++ b/my/stackexchange/gdpr.py @@ -6,11 +6,8 @@ Stackexchange data (uses [[https://stackoverflow.com/legal/gdpr/request][officia ### config from dataclasses import dataclass - from my.config import stackexchange as user_config -from my.core import Json, PathIsh, get_files, make_config - - +from my.core import PathIsh, make_config, get_files, Json @dataclass class stackexchange(user_config): gdpr_path: PathIsh # path to GDPR zip file @@ -20,13 +17,9 @@ config = make_config(stackexchange) # TODO just merge all of them and then filter?.. not sure -from collections.abc import Iterable -from datetime import datetime -from typing import NamedTuple - from my.core.compat import fromisoformat - - +from typing import NamedTuple, Iterable +from datetime import datetime class Vote(NamedTuple): j: Json # todo ip? @@ -49,7 +42,7 @@ class Vote(NamedTuple): # hmm, this loads very raw comments without the rest of the page? # - https://meta.stackexchange.com/posts/27319/comments#comment-57475 # - # parentPostId is the original question + # parentPostId is the original quesion # TODO is not always present? fucking hell # seems like there is no way to get a hierarchical comment link.. guess this needs to be handled in Promnesia normalisation... # postId is the answer @@ -69,10 +62,7 @@ class Vote(NamedTuple): # todo expose vote type? import json - from ..core.error import Res - - def votes() -> Iterable[Res[Vote]]: # TODO there is also some site specific stuff in qa/ directory.. not sure if its' more detailed # todo should be defensive? not sure if present when user has no votes @@ -84,8 +74,6 @@ def votes() -> Iterable[Res[Vote]]: yield Vote(r) -from ..core import Stats, stat - - +from ..core import stat, Stats def stats() -> Stats: return stat(votes) diff --git a/my/stackexchange/stexport.py b/my/stackexchange/stexport.py index 111ed28..812a155 100644 --- a/my/stackexchange/stexport.py +++ b/my/stackexchange/stexport.py @@ -16,8 +16,7 @@ from my.core import ( make_config, stat, ) - -import my.config # isort: skip +import my.config @dataclass diff --git a/my/taplog.py b/my/taplog.py index 5e64a72..51eeb72 100644 --- a/my/taplog.py +++ b/my/taplog.py @@ -1,26 +1,24 @@ ''' [[https://play.google.com/store/apps/details?id=com.waterbear.taglog][Taplog]] app data ''' -from __future__ import annotations - -from collections.abc import Iterable from datetime import datetime -from typing import NamedTuple +from typing import NamedTuple, Dict, Optional, Iterable + +from my.core import get_files, stat, Stats +from my.core.sqlite import sqlite_connection from my.config import taplog as user_config -from my.core import Stats, get_files, stat -from my.core.sqlite import sqlite_connection class Entry(NamedTuple): - row: dict + row: Dict @property def id(self) -> str: return str(self.row['_id']) @property - def number(self) -> float | None: + def number(self) -> Optional[float]: ns = self.row['number'] # TODO ?? if isinstance(ns, str): diff --git a/my/telegram/telegram_backup.py b/my/telegram/telegram_backup.py index eea7e50..ff4f904 100644 --- a/my/telegram/telegram_backup.py +++ b/my/telegram/telegram_backup.py @@ -1,17 +1,17 @@ """ Telegram data via [fabianonline/telegram_backup](https://github.com/fabianonline/telegram_backup) tool """ -from __future__ import annotations -import sqlite3 -from collections.abc import Iterator from dataclasses import dataclass from datetime import datetime, timezone -from struct import calcsize, unpack_from +from struct import unpack_from, calcsize +import sqlite3 +from typing import Dict, Iterator, Optional + +from my.core import datetime_aware, PathIsh +from my.core.sqlite import sqlite_connection from my.config import telegram as user_config -from my.core import PathIsh, datetime_aware -from my.core.sqlite import sqlite_connection @dataclass @@ -23,17 +23,17 @@ class config(user_config.telegram_backup): @dataclass class Chat: id: str - name: str | None + name: Optional[str] # not all users have short handle + groups don't have them either? # TODO hmm some groups have it -- it's just the tool doesn't dump them?? - handle: str | None + handle: Optional[str] # not sure if need type? @dataclass class User: id: str - name: str | None + name: Optional[str] @dataclass @@ -44,7 +44,7 @@ class Message: chat: Chat sender: User text: str - extra_media_info: str | None = None + extra_media_info: Optional[str] = None @property def permalink(self) -> str: @@ -61,7 +61,7 @@ class Message: -Chats = dict[str, Chat] +Chats = Dict[str, Chat] def _message_from_row(r: sqlite3.Row, *, chats: Chats, with_extra_media_info: bool) -> Message: ts = r['time'] # desktop export uses UTC (checked by exporting in winter time vs summer time) @@ -70,7 +70,7 @@ def _message_from_row(r: sqlite3.Row, *, chats: Chats, with_extra_media_info: bo chat = chats[r['source_id']] sender = chats[r['sender_id']] - extra_media_info: str | None = None + extra_media_info: Optional[str] = None if with_extra_media_info and r['has_media'] == 1: # also it's quite hacky, so at least for now it's just an optional attribute behind the flag # defensive because it's a bit tricky to correctly parse without a proper api parser.. @@ -90,7 +90,7 @@ def _message_from_row(r: sqlite3.Row, *, chats: Chats, with_extra_media_info: bo ) -def messages(*, extra_where: str | None=None, with_extra_media_info: bool=False) -> Iterator[Message]: +def messages(*, extra_where: Optional[str]=None, with_extra_media_info: bool=False) -> Iterator[Message]: messages_query = 'SELECT * FROM messages WHERE message_type NOT IN ("service_message", "empty_message")' if extra_where is not None: messages_query += ' AND ' + extra_where @@ -106,7 +106,7 @@ def messages(*, extra_where: str | None=None, with_extra_media_info: bool=False) for r in db.execute('SELECT * FROM users ORDER BY id'): first = r["first_name"] last = r["last_name"] - name: str | None + name: Optional[str] if first is not None and last is not None: name = f'{first} {last}' else: @@ -121,7 +121,7 @@ def messages(*, extra_where: str | None=None, with_extra_media_info: bool=False) yield _message_from_row(r, chats=chats, with_extra_media_info=with_extra_media_info) -def _extract_extra_media_info(data: bytes) -> str | None: +def _extract_extra_media_info(data: bytes) -> Optional[str]: # ugh... very hacky, but it does manage to extract from 90% of messages that have media pos = 0 diff --git a/my/tests/bluemaestro.py b/my/tests/bluemaestro.py index d139a8f..2d7c81e 100644 --- a/my/tests/bluemaestro.py +++ b/my/tests/bluemaestro.py @@ -1,4 +1,4 @@ -from collections.abc import Iterator +from typing import Iterator import pytest from more_itertools import one diff --git a/my/tests/body/weight.py b/my/tests/body/weight.py index f26ccf2..069e940 100644 --- a/my/tests/body/weight.py +++ b/my/tests/body/weight.py @@ -1,10 +1,8 @@ from pathlib import Path - -import pytest import pytz - -from my.body.weight import from_orgmode from my.core.cfg import tmp_config +import pytest +from my.body.weight import from_orgmode def test_body_weight() -> None: diff --git a/my/tests/commits.py b/my/tests/commits.py index 48e349f..c967027 100644 --- a/my/tests/commits.py +++ b/my/tests/commits.py @@ -1,11 +1,14 @@ import os from pathlib import Path -import pytest from more_itertools import bucket +import pytest + + +from my.core.cfg import tmp_config from my.coding.commits import commits -from my.core.cfg import tmp_config + pytestmark = pytest.mark.skipif( os.name == 'nt', diff --git a/my/tests/location/fallback.py b/my/tests/location/fallback.py index c09b902..10a4e5b 100644 --- a/my/tests/location/fallback.py +++ b/my/tests/location/fallback.py @@ -2,8 +2,8 @@ To test my.location.fallback_location.all """ -from collections.abc import Iterator from datetime import datetime, timedelta, timezone +from typing import Iterator import pytest from more_itertools import ilen diff --git a/my/tests/reddit.py b/my/tests/reddit.py index 4ddccf8..4f1ec51 100644 --- a/my/tests/reddit.py +++ b/my/tests/reddit.py @@ -1,14 +1,16 @@ import pytest from more_itertools import consume +from my.core.cfg import tmp_config +from my.core.utils.itertools import ensure_unique + +from .common import testdata + + # deliberately use mixed style imports on the top level and inside the methods to test tmp_config stuff # todo won't really be necessary once we migrate to lazy user config import my.reddit.all as my_reddit_all import my.reddit.rexport as my_reddit_rexport -from my.core.cfg import tmp_config -from my.core.utils.itertools import ensure_unique - -from .common import testdata def test_basic_1() -> None: diff --git a/my/time/tz/common.py b/my/time/tz/common.py index c0dd262..13c8ac0 100644 --- a/my/time/tz/common.py +++ b/my/time/tz/common.py @@ -3,6 +3,7 @@ from typing import Callable, Literal, cast from my.core import datetime_aware + ''' Depending on the specific data provider and your level of paranoia you might expect different behaviour.. E.g.: - if your objects already have tz info, you might not need to call localize() at all diff --git a/my/time/tz/main.py b/my/time/tz/main.py index bdd36b1..fafc5fe 100644 --- a/my/time/tz/main.py +++ b/my/time/tz/main.py @@ -6,7 +6,6 @@ from datetime import datetime from my.core import datetime_aware - # todo hmm, kwargs isn't mypy friendly.. but specifying types would require duplicating default args. uhoh def localize(dt: datetime, **kwargs) -> datetime_aware: # todo document patterns for combining multiple data sources diff --git a/my/time/tz/via_location.py b/my/time/tz/via_location.py index 1b2275b..4920333 100644 --- a/my/time/tz/via_location.py +++ b/my/time/tz/via_location.py @@ -2,8 +2,6 @@ Timezone data provider, guesses timezone based on location data (e.g. GPS) ''' -from __future__ import annotations - REQUIRES = [ # for determining timezone by coordinate 'timezonefinder', @@ -12,7 +10,6 @@ REQUIRES = [ import heapq import os from collections import Counter -from collections.abc import Iterable, Iterator from dataclasses import dataclass from datetime import date, datetime from functools import lru_cache @@ -20,7 +17,14 @@ from itertools import groupby from typing import ( TYPE_CHECKING, Any, + Dict, + Iterable, + Iterator, + List, + Optional, Protocol, + Set, + Tuple, ) import pytz @@ -98,7 +102,7 @@ def _timezone_finder(*, fast: bool) -> Any: # for backwards compatibility -def _locations() -> Iterator[tuple[LatLon, datetime_aware]]: +def _locations() -> Iterator[Tuple[LatLon, datetime_aware]]: try: import my.location.all @@ -121,7 +125,7 @@ def _locations() -> Iterator[tuple[LatLon, datetime_aware]]: # TODO: could use heapmerge or sort the underlying iterators somehow? # see https://github.com/karlicoss/HPI/pull/237#discussion_r858372934 -def _sorted_locations() -> list[tuple[LatLon, datetime_aware]]: +def _sorted_locations() -> List[Tuple[LatLon, datetime_aware]]: return sorted(_locations(), key=lambda x: x[1]) @@ -136,7 +140,7 @@ class DayWithZone: zone: Zone -def _find_tz_for_locs(finder: Any, locs: Iterable[tuple[LatLon, datetime]]) -> Iterator[DayWithZone]: +def _find_tz_for_locs(finder: Any, locs: Iterable[Tuple[LatLon, datetime]]) -> Iterator[DayWithZone]: for (lat, lon), dt in locs: # TODO right. its _very_ slow... zone = finder.timezone_at(lat=lat, lng=lon) @@ -168,7 +172,7 @@ def _iter_local_dates() -> Iterator[DayWithZone]: # TODO: warnings doesn't actually warn? # warnings = [] - locs: Iterable[tuple[LatLon, datetime]] + locs: Iterable[Tuple[LatLon, datetime]] locs = _sorted_locations() if cfg.sort_locations else _locations() yield from _find_tz_for_locs(finder, locs) @@ -183,7 +187,7 @@ def _iter_local_dates_fallback() -> Iterator[DayWithZone]: cfg = make_config() - def _fallback_locations() -> Iterator[tuple[LatLon, datetime]]: + def _fallback_locations() -> Iterator[Tuple[LatLon, datetime]]: for loc in sorted(flocs(), key=lambda x: x.dt): yield ((loc.lat, loc.lon), loc.dt) @@ -221,14 +225,14 @@ def _iter_tzs() -> Iterator[DayWithZone]: # we need to sort them first before we can do a groupby by_day = lambda p: p.day - local_dates: list[DayWithZone] = sorted(_iter_local_dates(), key=by_day) + local_dates: List[DayWithZone] = sorted(_iter_local_dates(), key=by_day) logger.debug(f"no. of items using exact locations: {len(local_dates)}") - local_dates_fallback: list[DayWithZone] = sorted(_iter_local_dates_fallback(), key=by_day) + local_dates_fallback: List[DayWithZone] = sorted(_iter_local_dates_fallback(), key=by_day) # find days that are in fallback but not in local_dates (i.e., missing days) - local_dates_set: set[date] = {d.day for d in local_dates} - use_fallback_days: list[DayWithZone] = [d for d in local_dates_fallback if d.day not in local_dates_set] + local_dates_set: Set[date] = {d.day for d in local_dates} + use_fallback_days: List[DayWithZone] = [d for d in local_dates_fallback if d.day not in local_dates_set] logger.debug(f"no. of items being used from fallback locations: {len(use_fallback_days)}") # combine local_dates and missing days from fallback into a sorted list @@ -242,20 +246,20 @@ def _iter_tzs() -> Iterator[DayWithZone]: @lru_cache(1) -def _day2zone() -> dict[date, pytz.BaseTzInfo]: +def _day2zone() -> Dict[date, pytz.BaseTzInfo]: # NOTE: kinda unfortunate that this will have to process all days before returning result for just one # however otherwise cachew cache might never be initialized properly - # so we'll always end up recomputing everything during subsequent runs + # so we'll always end up recomputing everyting during subsequent runs return {dz.day: pytz.timezone(dz.zone) for dz in _iter_tzs()} -def _get_day_tz(d: date) -> pytz.BaseTzInfo | None: +def _get_day_tz(d: date) -> Optional[pytz.BaseTzInfo]: return _day2zone().get(d) # ok to cache, there are only a few home locations? @lru_cache(None) -def _get_home_tz(loc: LatLon) -> pytz.BaseTzInfo | None: +def _get_home_tz(loc: LatLon) -> Optional[pytz.BaseTzInfo]: (lat, lng) = loc finder = _timezone_finder(fast=False) # ok to use slow here for better precision zone = finder.timezone_at(lat=lat, lng=lng) @@ -266,7 +270,7 @@ def _get_home_tz(loc: LatLon) -> pytz.BaseTzInfo | None: return pytz.timezone(zone) -def get_tz(dt: datetime) -> pytz.BaseTzInfo | None: +def get_tz(dt: datetime) -> Optional[pytz.BaseTzInfo]: ''' Given a datetime, returns the timezone for that date. ''' diff --git a/my/tinder/android.py b/my/tinder/android.py index 5a5d887..d9b256b 100644 --- a/my/tinder/android.py +++ b/my/tinder/android.py @@ -3,22 +3,20 @@ Tinder data from Android app database (in =/data/data/com.tinder/databases/tinde """ from __future__ import annotations -import sqlite3 -from collections import Counter, defaultdict -from collections.abc import Iterator, Mapping, Sequence +from collections import defaultdict, Counter from dataclasses import dataclass from datetime import datetime, timezone from itertools import chain from pathlib import Path -from typing import Union +import sqlite3 +from typing import Sequence, Iterator, Union, Dict, List, Mapping -from my.core import Paths, Res, Stats, datetime_aware, get_files, make_logger, stat +from my.core import Paths, get_files, Res, stat, Stats, datetime_aware, make_logger from my.core.common import unique_everseen from my.core.compat import assert_never from my.core.error import echain from my.core.sqlite import sqlite_connection - -import my.config # isort: skip +import my.config logger = make_logger(__name__) @@ -106,7 +104,7 @@ def _handle_db(db: sqlite3.Connection) -> Iterator[Res[_Entity]]: user_profile_rows = list(db.execute('SELECT * FROM profile_user_view')) if len(user_profile_rows) == 0: - # shit, sometime in 2023 profile_user_view stopped containing user profile.. + # shit, sometime in 2023 profile_user_view stoppped containing user profile.. # presumably the most common from_id/to_id would be our own username counter = Counter([id_ for (id_,) in db.execute('SELECT from_id FROM message UNION ALL SELECT to_id FROM message')]) if len(counter) > 0: # this might happen if db is empty (e.g. user got logged out) @@ -166,8 +164,8 @@ def _parse_msg(row: sqlite3.Row) -> _Message: # todo maybe it's rich_entities method? def entities() -> Iterator[Res[Entity]]: - id2person: dict[str, Person] = {} - id2match: dict[str, Match] = {} + id2person: Dict[str, Person] = {} + id2match: Dict[str, Match] = {} for x in unique_everseen(_entities): if isinstance(x, Exception): yield x @@ -219,7 +217,7 @@ def messages() -> Iterator[Res[Message]]: # todo not sure, maybe it's not fundamental enough to keep here... def match2messages() -> Iterator[Res[Mapping[Match, Sequence[Message]]]]: - res: dict[Match, list[Message]] = defaultdict(list) + res: Dict[Match, List[Message]] = defaultdict(list) for x in entities(): if isinstance(x, Exception): yield x diff --git a/my/topcoder.py b/my/topcoder.py index 40df77c..07f71be 100644 --- a/my/topcoder.py +++ b/my/topcoder.py @@ -1,14 +1,14 @@ -import json -from collections.abc import Iterator, Sequence from dataclasses import dataclass from functools import cached_property +import json from pathlib import Path +from typing import Iterator, Sequence -from my.core import Res, datetime_aware, get_files +from my.core import get_files, Res, datetime_aware from my.core.compat import fromisoformat from my.experimental.destructive_parsing import Manager -from my.config import topcoder as config # type: ignore[attr-defined] # isort: skip +from my.config import topcoder as config # type: ignore[attr-defined] def inputs() -> Sequence[Path]: @@ -81,7 +81,7 @@ def _parse_one(p: Path) -> Iterator[Res[Competition]]: # but also expects cooperation from .make method (e.g. popping items from the dict) # could also wrap in helper and pass to .make .. not sure # an argument could be made that .make isn't really a class methond.. - # it's pretty specific to this parser only + # it's pretty specific to this parser onl yield from Competition.make(j=c) yield from m.check() diff --git a/my/twitter/all.py b/my/twitter/all.py index c2c471e..4714021 100644 --- a/my/twitter/all.py +++ b/my/twitter/all.py @@ -1,11 +1,11 @@ """ Unified Twitter data (merged from the archive and periodic updates) """ -from collections.abc import Iterator - +from typing import Iterator from ..core import Res from ..core.source import import_source -from .common import Tweet, merge_tweets +from .common import merge_tweets, Tweet + # NOTE: you can comment out the sources you don't need src_twint = import_source(module_name='my.twitter.twint') diff --git a/my/twitter/android.py b/my/twitter/android.py index 7e8f170..ada04ae 100644 --- a/my/twitter/android.py +++ b/my/twitter/android.py @@ -4,20 +4,20 @@ Twitter data from official app for Android from __future__ import annotations -import re -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path +import re from struct import unpack_from +from typing import Iterator, Sequence, Set -from my.core import LazyLogger, Paths, Res, datetime_aware, get_files +from my.core import datetime_aware, get_files, LazyLogger, Paths, Res from my.core.common import unique_everseen from my.core.sqlite import sqlite_connect_immutable -from .common import permalink +import my.config -import my.config # isort: skip +from .common import permalink logger = LazyLogger(__name__) @@ -155,28 +155,15 @@ _SELECT_OWN_TWEETS = '_SELECT_OWN_TWEETS' def get_own_user_id(conn) -> str: # unclear what's the reliable way to query it, so we use multiple different ones and arbitrate # NOTE: 'SELECT DISTINCT ev_owner_id FROM lists' doesn't work, might include lists from other people? - res: set[str] = set() + res: Set[str] = set() # need to cast as it's int by default for q in [ 'SELECT DISTINCT CAST(list_mapping_user_id AS TEXT) FROM list_mapping', 'SELECT DISTINCT CAST(owner_id AS TEXT) FROM cursors', 'SELECT DISTINCT CAST(user_id AS TEXT) FROM users WHERE _id == 1', - # ugh, sometimes all of the above are empty... - # for the rest it seems: - # - is_active_creator is NULL - # - is_graduated is NULL - # - profile_highlighted_info is NULL - 'SELECT DISTINCT CAST(user_id AS TEXT) FROM users WHERE is_active_creator == 0 AND is_graduated == 1 AND profile_highlights_info IS NOT NULL', ]: - res |= {r for (r,) in conn.execute(q)} - - assert len(res) <= 1, res - if len(res) == 0: - # sometimes even all of the above doesn't help... - # last resort is trying to get from status_groups table - # however we can't always use it because it might contain multiple different owner_id? - # not sure, maybe it will break as well and we'll need to fallback on the most common or something.. - res |= {r for (r,) in conn.execute('SELECT DISTINCT CAST(owner_id AS TEXT) FROM status_groups')} + for (r,) in conn.execute(q): + res.add(r) assert len(res) == 1, res [r] = res return r @@ -205,7 +192,7 @@ def get_own_user_id(conn) -> str: # - timeline_data_type # 1 : the bulk of tweets, but also some notifications etc?? # 2 : who-to-follow/community-to-join. contains a couple of tweets, but their corresponding status_id is NULL -# 8 : who-to-follow/notification +# 8 : who-to-follow/notfication # 13: semantic-core/who-to-follow # 14: cursor # 17: trends @@ -252,7 +239,7 @@ def _process_one(f: Path, *, where: str) -> Iterator[Res[Tweet]]: NOT (statuses.in_r_user_id == -1 AND statuses.in_r_status_id == -1 AND statuses.conversation_id == 0) ''' - def _query_one(*, where: str, quoted: set[int]) -> Iterator[Res[Tweet]]: + def _query_one(*, where: str, quoted: Set[int]) -> Iterator[Res[Tweet]]: for ( tweet_id, user_username, @@ -276,7 +263,7 @@ def _process_one(f: Path, *, where: str) -> Iterator[Res[Tweet]]: text=content, ) - quoted: set[int] = set() + quoted: Set[int] = set() yield from _query_one(where=db_where, quoted=quoted) # get quoted tweets 'recursively' # TODO maybe do it for favs/bookmarks too? not sure diff --git a/my/twitter/archive.py b/my/twitter/archive.py index c9d2dbc..1573754 100644 --- a/my/twitter/archive.py +++ b/my/twitter/archive.py @@ -7,7 +7,6 @@ from __future__ import annotations import html import json # hmm interesting enough, orjson didn't give much speedup here? from abc import abstractmethod -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime from functools import cached_property @@ -15,6 +14,8 @@ from itertools import chain from pathlib import Path from typing import ( TYPE_CHECKING, + Iterator, + Sequence, ) from more_itertools import unique_everseen diff --git a/my/twitter/common.py b/my/twitter/common.py index 8c346f6..258216f 100644 --- a/my/twitter/common.py +++ b/my/twitter/common.py @@ -1,19 +1,17 @@ -from my.core import __NOT_HPI_MODULE__ # isort: skip +from my.core import __NOT_HPI_MODULE__ -from collections.abc import Iterator from itertools import chain -from typing import Any +from typing import Iterator, Any from more_itertools import unique_everseen + # TODO add proper Protocol for Tweet Tweet = Any TweetId = str -from my.core import Res, warn_if_empty - - +from my.core import warn_if_empty, Res @warn_if_empty def merge_tweets(*sources: Iterator[Res[Tweet]]) -> Iterator[Res[Tweet]]: def key(r: Res[Tweet]): diff --git a/my/twitter/talon.py b/my/twitter/talon.py index dbf2e2e..1b79727 100644 --- a/my/twitter/talon.py +++ b/my/twitter/talon.py @@ -7,11 +7,10 @@ from __future__ import annotations import re import sqlite3 from abc import abstractmethod -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path -from typing import Union +from typing import Iterator, Sequence, Union from my.core import Paths, Res, datetime_aware, get_files from my.core.common import unique_everseen diff --git a/my/twitter/twint.py b/my/twitter/twint.py index 9d36a93..ceb5406 100644 --- a/my/twitter/twint.py +++ b/my/twitter/twint.py @@ -1,17 +1,17 @@ """ Twitter data (tweets and favorites). Uses [[https://github.com/twintproject/twint][Twint]] data export. """ -from collections.abc import Iterator from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path -from typing import NamedTuple +from typing import NamedTuple, Iterator, List -from my.core import Json, LazyLogger, Paths, Res, Stats, datetime_aware, get_files, stat + +from my.core import Paths, Res, get_files, LazyLogger, Json, datetime_aware, stat, Stats from my.core.cfg import make_config from my.core.sqlite import sqlite_connection -from my.config import twint as user_config # isort: skip +from my.config import twint as user_config # TODO move to twitter.twint config structure @@ -54,7 +54,7 @@ class Tweet(NamedTuple): # https://github.com/thomasancheriyil/Red-Tide-Detection-based-on-Twitter/blob/beb200be60cc66dcbc394e670513715509837812/python/twitterGapParse.py#L61-L62 # # twint is also saving 'timezone', but this is local machine timezone at the time of scraping? - # perhaps they thought date-time-ms was local time... or just kept it just in case (they are keeping lots on unnecessary stuff in the db) + # perhaps they thought date-time-ms was local time... or just kept it just in case (they are keepin lots on unnecessary stuff in the db) return datetime.fromtimestamp(seconds, tz=tz) @property @@ -76,7 +76,7 @@ class Tweet(NamedTuple): return text @property - def urls(self) -> list[str]: + def urls(self) -> List[str]: ustr = self.row['urls'] if len(ustr) == 0: return [] diff --git a/my/util/hpi_heartbeat.py b/my/util/hpi_heartbeat.py index 6dcac7e..84790a4 100644 --- a/my/util/hpi_heartbeat.py +++ b/my/util/hpi_heartbeat.py @@ -5,13 +5,12 @@ In particular the behaviour of import_original_module function The idea of testing is that overlays extend this module, and add their own items to items(), and the checker asserts all overlays have contributed. """ +from my.core import __NOT_HPI_MODULE__ -from my.core import __NOT_HPI_MODULE__ # isort: skip - -import sys -from collections.abc import Iterator from dataclasses import dataclass from datetime import datetime +import sys +from typing import Iterator, List NOW = datetime.now() @@ -20,10 +19,10 @@ NOW = datetime.now() class Item: dt: datetime message: str - path: list[str] + path: List[str] -def get_pkg_path() -> list[str]: +def get_pkg_path() -> List[str]: pkg = sys.modules[__package__] return list(pkg.__path__) diff --git a/my/vk/favorites.py b/my/vk/favorites.py index 5f278ff..9caae6d 100644 --- a/my/vk/favorites.py +++ b/my/vk/favorites.py @@ -1,21 +1,20 @@ # todo: uses my private export script?, timezone -from __future__ import annotations - -import json -from collections.abc import Iterable, Iterator from dataclasses import dataclass from datetime import datetime, timezone +import json +from typing import Iterator, Iterable, Optional + +from my.core import Json, datetime_aware, stat, Stats +from my.core.error import Res from my.config import vk as config # type: ignore[attr-defined] -from my.core import Json, Stats, datetime_aware, stat -from my.core.error import Res @dataclass class Favorite: dt: datetime_aware title: str - url: str | None + url: Optional[str] text: str diff --git a/my/vk/vk_messages_backup.py b/my/vk/vk_messages_backup.py index 4f593c8..c73587f 100644 --- a/my/vk/vk_messages_backup.py +++ b/my/vk/vk_messages_backup.py @@ -2,17 +2,19 @@ VK data (exported by [[https://github.com/Totktonada/vk_messages_backup][Totktonada/vk_messages_backup]]) ''' # note: could reuse the original repo, but little point I guess since VK closed their API -import json -from collections.abc import Iterator from dataclasses import dataclass from datetime import datetime +import json +from typing import Dict, Iterator import pytz -from my.config import vk_messages_backup as config -from my.core import Json, Res, Stats, datetime_aware, get_files, stat +from my.core import stat, Stats, Json, Res, datetime_aware, get_files from my.core.common import unique_everseen +from my.config import vk_messages_backup as config + + # I think vk_messages_backup used this tz? # not sure if vk actually used to return this tz in api? TZ = pytz.timezone('Europe/Moscow') @@ -43,7 +45,7 @@ class Message: body: str -Users = dict[Uid, User] +Users = Dict[Uid, User] def users() -> Users: diff --git a/my/whatsapp/android.py b/my/whatsapp/android.py index a8dbe8d..3dfed3e 100644 --- a/my/whatsapp/android.py +++ b/my/whatsapp/android.py @@ -1,22 +1,20 @@ """ Whatsapp data from Android app database (in =/data/data/com.whatsapp/databases/msgstore.db=) """ - from __future__ import annotations -import sqlite3 -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path -from typing import Union +import sqlite3 +from typing import Union, Sequence, Iterator, Optional -from my.core import Paths, Res, datetime_aware, get_files, make_config, make_logger +from my.core import get_files, Paths, datetime_aware, Res, make_logger, make_config from my.core.common import unique_everseen from my.core.error import echain, notnone from my.core.sqlite import sqlite_connection +import my.config -import my.config # isort: skip logger = make_logger(__name__) @@ -25,7 +23,7 @@ logger = make_logger(__name__) class Config(my.config.whatsapp.android): # paths[s]/glob to the exported sqlite databases export_path: Paths - my_user_id: str | None = None + my_user_id: Optional[str] = None config = make_config(Config) @@ -40,13 +38,13 @@ class Chat: id: str # todo not sure how to support renames? # could change Chat object itself, but this won't work well with incremental processing.. - name: str | None + name: Optional[str] @dataclass(unsafe_hash=True) class Sender: id: str - name: str | None + name: Optional[str] @dataclass(unsafe_hash=True) @@ -55,7 +53,7 @@ class Message: id: str dt: datetime_aware sender: Sender - text: str | None + text: Optional[str] Entity = Union[Chat, Sender, Message] @@ -64,27 +62,11 @@ Entity = Union[Chat, Sender, Message] def _process_db(db: sqlite3.Connection) -> Iterator[Entity]: # TODO later, split out Chat/Sender objects separately to safe on object creation, similar to other android data sources - try: - db.execute('SELECT jid_row_id FROM chat_view') - except sqlite3.OperationalError as oe: - if 'jid_row_id' not in str(oe): - raise oe - new_version_202410 = False - else: - new_version_202410 = True - - if new_version_202410: - chat_id_col = 'jid.raw_string' - jid_join = 'JOIN jid ON jid._id == chat_view.jid_row_id' - else: - chat_id_col = 'chat_view.raw_string_jid' - jid_join = '' - chats = {} for r in db.execute( - f''' - SELECT {chat_id_col} AS chat_id, subject - FROM chat_view {jid_join} + ''' + SELECT raw_string_jid AS chat_id, subject + FROM chat_view WHERE chat_id IS NOT NULL /* seems that it might be null for chats that are 'recycled' (the db is more like an LRU cache) */ ''' ): @@ -106,7 +88,6 @@ def _process_db(db: sqlite3.Connection) -> Iterator[Entity]: ): # TODO seems that msgstore.db doesn't have contact names # perhaps should extract from wa.db and match against wa_contacts.jid? - # TODO these can also be chats? not sure if need to include... s = Sender( id=r['raw_string'], name=None, @@ -118,9 +99,9 @@ def _process_db(db: sqlite3.Connection) -> Iterator[Entity]: # so even if it seems as if it has a column (e.g. for attachment path), there is actually no such data # so makes more sense to just query message column directly for r in db.execute( - f''' + ''' SELECT - {chat_id_col} AS chat_id, + C.raw_string_jid AS chat_id, M.key_id, M.timestamp, sender_jid_row_id, M.from_me, @@ -129,9 +110,8 @@ def _process_db(db: sqlite3.Connection) -> Iterator[Entity]: MM.file_size, M.message_type FROM message AS M - LEFT JOIN chat_view ON M.chat_row_id = chat_view._id - {jid_join} - left JOIN message_media AS MM ON M._id = MM.message_row_id + LEFT JOIN chat_view AS C ON M.chat_row_id = C._id + LEFT JOIN message_media AS MM ON M._id = MM.message_row_id WHERE M.key_id != -1 /* key_id -1 is some sort of fake message where everything is null */ /* type 7 seems to be some dummy system message. sometimes contain chat name, but usually null, so ignore them @@ -145,9 +125,9 @@ def _process_db(db: sqlite3.Connection) -> Iterator[Entity]: ts: int = notnone(r['timestamp']) dt = datetime.fromtimestamp(ts / 1000, tz=timezone.utc) - text: str | None = r['text_data'] - media_file_path: str | None = r['file_path'] - media_file_size: int | None = r['file_size'] + text: Optional[str] = r['text_data'] + media_file_path: Optional[str] = r['file_path'] + media_file_size: Optional[int] = r['file_size'] message_type = r['message_type'] @@ -199,7 +179,7 @@ def _process_db(db: sqlite3.Connection) -> Iterator[Entity]: sender_row_id = r['sender_jid_row_id'] if sender_row_id == 0: # seems that it's always 0 for 1-1 chats - # for group chats our own id is still 0, but other ids are properly set + # for group chats our onw id is still 0, but other ids are properly set if from_me: myself_user_id = config.my_user_id or 'MYSELF_USER_ID' sender = Sender(id=myself_user_id, name=None) # TODO set my own name as well? diff --git a/my/youtube/takeout.py b/my/youtube/takeout.py index 8eca328..bbce46a 100644 --- a/my/youtube/takeout.py +++ b/my/youtube/takeout.py @@ -1,11 +1,10 @@ from __future__ import annotations -from collections.abc import Iterable, Iterator from dataclasses import dataclass -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING, Any, Iterable, Iterator from my.core import Res, Stats, datetime_aware, make_logger, stat, warnings -from my.core.compat import deprecated +from my.core.compat import deprecated, removeprefix, removesuffix logger = make_logger(__name__) @@ -36,7 +35,7 @@ def watched() -> Iterator[Res[Watched]]: continue # older exports (e.g. html) didn't have microseconds - # whereas newer json ones do have them + # wheras newer json ones do have them # seconds resolution is enough to distinguish watched videos # also we're processing takeouts in HPI in reverse order, so first seen watch would contain microseconds, resulting in better data without_microsecond = w.when.replace(microsecond=0) @@ -118,10 +117,10 @@ def _watched() -> Iterator[Res[Watched]]: # all titles contain it, so pointless to include 'Watched ' # also compatible with legacy titles - title = title.removeprefix('Watched ') + title = removeprefix(title, 'Watched ') # watches originating from some activity end with this, remove it for consistency - title = title.removesuffix(' - YouTube') + title = removesuffix(title, ' - YouTube') if YOUTUBE_VIDEO_LINK not in url: if 'youtube.com/post/' in url: diff --git a/my/zotero.py b/my/zotero.py index 8eb34ba..4440aae 100644 --- a/my/zotero.py +++ b/my/zotero.py @@ -1,16 +1,14 @@ -from __future__ import annotations as _annotations - -import json -import sqlite3 -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone +import json +from typing import Iterator, Optional, Dict, Any, Sequence from pathlib import Path -from typing import Any +import sqlite3 -from my.core import Res, datetime_aware, make_logger +from my.core import make_logger, Res, datetime_aware from my.core.sqlite import sqlite_copy_and_open + logger = make_logger(__name__) @@ -28,7 +26,7 @@ class Item: """Corresponds to 'Zotero item'""" file: Path title: str - url: Url | None + url: Optional[Url] tags: Sequence[str] @@ -41,8 +39,8 @@ class Annotation: page: int """0-indexed""" - text: str | None - comment: str | None + text: Optional[str] + comment: Optional[str] tags: Sequence[str] color_hex: str """Original hex-encoded color in zotero""" @@ -99,7 +97,7 @@ WHERE ID.fieldID = 13 AND IA.itemID = ? # TODO maybe exclude 'private' methods from detection? -def _query_raw() -> Iterator[Res[dict[str, Any]]]: +def _query_raw() -> Iterator[Res[Dict[str, Any]]]: [db] = inputs() with sqlite_copy_and_open(db) as conn: @@ -159,7 +157,7 @@ def _hex2human(color_hex: str) -> str: }.get(color_hex, color_hex) -def _parse_annotation(r: dict) -> Annotation: +def _parse_annotation(r: Dict) -> Annotation: text = r['text'] comment = r['comment'] # todo use json query for this? diff --git a/my/zulip/organization.py b/my/zulip/organization.py index d0cfcb7..2e0df4b 100644 --- a/my/zulip/organization.py +++ b/my/zulip/organization.py @@ -6,11 +6,11 @@ from __future__ import annotations import json from abc import abstractmethod -from collections.abc import Iterator, Sequence from dataclasses import dataclass from datetime import datetime, timezone from itertools import count from pathlib import Path +from typing import Iterator, Sequence from my.core import ( Json, diff --git a/ruff.toml b/ruff.toml index 3d803e7..5fbd657 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,4 +1,4 @@ -target-version = "py39" # NOTE: inferred from pyproject.toml if present +target-version = "py38" # NOTE: inferred from pyproject.toml if present lint.extend-select = [ "F", # flakes rules -- default, but extend just in case @@ -26,8 +26,8 @@ lint.extend-select = [ "TID", # various imports suggestions "TRY", # various exception handling rules "UP", # detect deprecated python stdlib stuff - "FA", # suggest using from __future__ import annotations - "PTH", # pathlib migration + # "FA", # suggest using from __future__ import annotations TODO enable later after we make sure cachew works? + # "PTH", # pathlib migration -- TODO enable later "ARG", # unused argument checks # "A", # builtin shadowing -- TODO handle later # "EM", # TODO hmm could be helpful to prevent duplicate err msg in traceback.. but kinda annoying @@ -35,11 +35,6 @@ lint.extend-select = [ # "ALL", # uncomment this to check for new rules! ] -# Preserve types, even if a file imports `from __future__ import annotations` -# we need this for cachew to work with HPI types on 3.9 -# can probably remove after 3.10? -lint.pyupgrade.keep-runtime-typing = true - lint.ignore = [ "D", # annoying nags about docstrings "N", # pep naming @@ -73,6 +68,11 @@ lint.ignore = [ "F841", # Local variable `count` is assigned to but never used ### +### TODO should be fine to use these with from __future__ import annotations? +### there was some issue with cachew though... double check this? + "UP006", # use type instead of Type + "UP007", # use X | Y instead of Union +### "RUF100", # unused noqa -- handle later "RUF012", # mutable class attrs should be annotated with ClassVar... ugh pretty annoying for user configs diff --git a/setup.py b/setup.py index 385c810..e49eee0 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def main() -> None: author_email='karlicoss@gmail.com', description='A Python interface to my life', - python_requires='>=3.9', + python_requires='>=3.8', install_requires=INSTALL_REQUIRES, extras_require={ 'testing': [