diff --git a/bitmapist/__init__.py b/bitmapist/__init__.py index 8f94359..90ae019 100644 --- a/bitmapist/__init__.py +++ b/bitmapist/__init__.py @@ -79,15 +79,18 @@ :developer: Amir Salihefendic ( http://amix.dk ) :license: BSD """ -from builtins import range, bytes -import threading -import redis -from typing import Union, Optional -from redis.client import Redis, Pipeline +from __future__ import annotations + import calendar +import threading +from builtins import bytes, range from collections import defaultdict -from datetime import datetime, date, timedelta +from datetime import date, datetime, timedelta +from typing import Any, Optional, Union + +import redis +from redis.client import Pipeline, Redis local_thread = threading.local() @@ -104,7 +107,7 @@ TRACK_UNIQUE = False -def setup_redis(name: str, host: str, port: int, **kw) -> None: +def setup_redis(name: str, host: str, port: int, **kw: Any) -> None: """ Setup a redis system. @@ -540,12 +543,14 @@ class WeekEvents(GenericPeriodEvents): """ @classmethod - def from_date(cls, event_name, dt=None, system="default"): + def from_date( + cls, event_name: str, dt: date | None = None, system: str = "default" + ): dt = dt or datetime.utcnow() dt_year, dt_week, _ = dt.isocalendar() return cls(event_name, dt_year, dt_week, system=system) - def __init__(self, event_name, year=None, week=None, system="default"): + def __init__(self, event_name: str, year=None, week=None, system="default"): now = datetime.utcnow() now_year, now_week, _ = now.isocalendar() self.event_name = event_name @@ -578,7 +583,7 @@ class DayEvents(GenericPeriodEvents): """ @classmethod - def from_date(cls, event_name, dt=None, system="default"): + def from_date(cls, event_name: str, dt: date | None = None, system="default"): dt = dt or datetime.utcnow() return cls(event_name, dt.year, dt.month, dt.day, system=system) @@ -597,10 +602,10 @@ def delta(self, value): dt = date(self.year, self.month, self.day) + timedelta(days=value) return self.__class__(self.event_name, dt.year, dt.month, dt.day, self.system) - def period_start(self): + def period_start(self) -> datetime: return datetime(self.year, self.month, self.day) - def period_end(self): + def period_end(self) -> datetime: return datetime(self.year, self.month, self.day, 23, 59, 59, 999999) @@ -614,12 +619,18 @@ class HourEvents(GenericPeriodEvents): """ @classmethod - def from_date(cls, event_name, dt=None, system="default"): + def from_date(cls, event_name: str, dt: datetime | None = None, system="default"): dt = dt or datetime.utcnow() return cls(event_name, dt.year, dt.month, dt.day, dt.hour, system=system) def __init__( - self, event_name, year=None, month=None, day=None, hour=None, system="default" + self, + event_name: str, + year: int | None = None, + month: int | None = None, + day: int | None = None, + hour: int | None = None, + system: str = "default", ): now = datetime.utcnow() self.event_name = event_name @@ -640,10 +651,10 @@ def delta(self, value): self.event_name, dt.year, dt.month, dt.day, dt.hour, self.system ) - def period_start(self): + def period_start(self) -> datetime: return datetime(self.year, self.month, self.day, self.hour) - def period_end(self): + def period_end(self) -> datetime: return datetime(self.year, self.month, self.day, self.hour, 59, 59, 999999) @@ -653,7 +664,6 @@ def period_end(self): class BitOperation( MixinIter, MixinContains, MixinCounts, MixinEventsMisc, MixinBitOperations ): - """ Base class for bit operations (AND, OR, XOR). @@ -680,11 +690,10 @@ class BitOperation( """ - def __init__(self, op_name, system_or_event, *events): + def __init__(self, op_name: str, system_or_event, *events): # Smartly resolve system_or_event, makes it possible to build a cleaner API if hasattr(system_or_event, "redis_key"): - events = list(events) - events.insert(0, system_or_event) + events = (system_or_event, *events) system = self.system = "default" else: system = self.system = system_or_event @@ -721,7 +730,7 @@ def __init__(self, system_or_event, *events): # --- Private -def _prefix_key(event_name: str, date: str): +def _prefix_key(event_name: str, date: str) -> str: return "trackist_%s_%s" % (event_name, date) @@ -749,14 +758,14 @@ def not_none(*keys): return key -def iso_year_start(iso_year): +def iso_year_start(iso_year: int) -> date: "The gregorian calendar date of the first day of the given ISO year" fourth_jan = date(iso_year, 1, 4) delta = timedelta(fourth_jan.isoweekday() - 1) return fourth_jan - delta -def iso_to_gregorian(iso_year, iso_week, iso_day): +def iso_to_gregorian(iso_year: int, iso_week: int, iso_day: int) -> date: "Gregorian calendar date for the given ISO year, week and day" year_start = iso_year_start(iso_year) return year_start + timedelta(days=iso_day - 1, weeks=iso_week - 1) diff --git a/bitmapist/cohort/__init__.py b/bitmapist/cohort/__init__.py index 1c19b97..50c0f61 100644 --- a/bitmapist/cohort/__init__.py +++ b/bitmapist/cohort/__init__.py @@ -62,23 +62,23 @@ :developer: Amir Salihefendic ( http://amix.dk ) :license: BSD """ +from datetime import date, datetime, timedelta from os import path +from typing import Any, Callable -from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta - from mako.lookup import TemplateLookup from bitmapist import ( - WeekEvents, + BitOpAnd, DayEvents, + GenericPeriodEvents, MonthEvents, + WeekEvents, YearEvents, - BitOpAnd, delete_runtime_bitop_keys, ) - # --- HTML rendering @@ -149,8 +149,8 @@ def render_html_data( dates_data, as_precent=True, time_group="days", - num_results=31, - num_of_rows=12, + num_results: int = 31, + num_of_rows: int = 12, start_date=None, ): """ @@ -178,8 +178,8 @@ def render_csv_data( dates_data, as_precent=True, time_group="days", - num_results=31, - num_of_rows=12, + num_results: int = 31, + num_of_rows: int = 12, start_date=None, ): """ @@ -322,10 +322,10 @@ def get_dates_data( # --- Custom handlers -CUSTOM_HANDLERS = {} +CUSTOM_HANDLERS: dict[str, Callable[..., Any]] = {} -def set_custom_handler(event_name, callback): +def set_custom_handler(event_name: str, callback) -> None: """ Set a custom handler for `event_name`. This makes it possible to construct event names that are complex @@ -359,41 +359,41 @@ def active_web_ios(key, cls, cls_args): # --- Private -def _dispatch(key, cls, cls_args): +def _dispatch(key: str, cls: type[GenericPeriodEvents], cls_args): if key in CUSTOM_HANDLERS: return CUSTOM_HANDLERS[key](key, cls, cls_args) else: return cls(key, *cls_args) -def _day_events_fn(key, date, system): +def _day_events_fn(key: str, date: date, system: str): cls = DayEvents cls_args = (date.year, date.month, date.day, system) return _dispatch(key, cls, cls_args) -def _weeks_events_fn(key, date, system): +def _weeks_events_fn(key: str, date: date, system: str): cls = WeekEvents cls_args = (date.year, date.isocalendar()[1], system) return _dispatch(key, cls, cls_args) -def _month_events_fn(key, date, system): +def _month_events_fn(key: str, date: date, system: str): cls = MonthEvents cls_args = (date.year, date.month, system) return _dispatch(key, cls, cls_args) -def _year_events_fn(key, date, system): +def _year_events_fn(key: str, date: date, system: str): cls = YearEvents cls_args = (date.year, system) return _dispatch(key, cls, cls_args) -_LOOKUP = None +_LOOKUP: TemplateLookup | None = None -def get_lookup(): +def get_lookup() -> TemplateLookup: global _LOOKUP if not _LOOKUP: