Fix typing errors in tracking extension

Author: amercader

ckan/lib/cli.py

@@ -7,7 +7,7 @@
 
 import click
 import paste.script  # type: ignore
-import routes  # type: ignore
+import routes
 from paste.registry import Registry  # type: ignore
 
 from urllib.parse import urlparse

ckan/lib/dictization/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import Any, Callable, Iterable, Literal
+from typing import Any, Callable, Iterable, Literal, cast
 
 import sqlalchemy
 from sqlalchemy import Table
@@ -127,7 +127,7 @@ def table_dict_save(
     '''
     session = context["session"]
 
-    table = class_mapper(ModelClass).persist_selectable
+    table = cast(Table, class_mapper(ModelClass).persist_selectable)
 
     obj = None
 

ckanext/tracking/cli/tracking.py

@@ -53,7 +53,7 @@ def update_all(start_date: Optional[str] = None):
         # No date given. See when we last have data for and get data
         # from 2 days before then in case new data is available.
         # If no date here then use 2011-01-01 as the start date
-        stmt = select(ts).order_by(desc(ts.tracking_date))
+        stmt = select(ts).order_by(ts.tracking_date.desc())
         result = session.scalars(stmt).first()
         if result:
             date = result.tracking_date
@@ -204,7 +204,7 @@ def update_tracking_summary_with_package_id(package_url: str):
     )
 
     session.query(ts).filter(
-        ts.package_id.is_(None),  # type: ignore
+        ts.package_id.is_(None),
         ts.tracking_type == "page",
     ).update(
         {ts.package_id: func.coalesce(subquery, "~~not~found~~")},
@@ -229,7 +229,7 @@ def update_tracking_summary_with_package_id(package_url: str):
         .filter(
             ta.url == ts.url,
             ta.tracking_date <= ts.tracking_date,
-            ta.tracking_date >= ts.tracking_date - 14,  # type: ignore
+            ta.tracking_date >= ts.tracking_date - 14,
         )
         .scalar_subquery()
     )
@@ -250,7 +250,7 @@ def update_tracking_summary_with_package_id(package_url: str):
     session.query(ts).filter(
         ts.running_total == 0,
         ts.tracking_type == "page",
-        ts.package_id.isnot(None),  # type: ignore
+        ts.package_id.isnot(None),
         ts.package_id != "~~not~found~~",
     ).update(
         {

ckanext/tracking/model.py

@@ -17,7 +17,7 @@
 
 import datetime
 
-from sqlalchemy import types, Column, text, Index
+from sqlalchemy import types, Column, text, Index, Table
 
 import ckan.model.meta as meta
 import ckan.model.domain_object as domain_object
@@ -27,17 +27,21 @@
 __all__ = ['TrackingSummary', 'TrackingRaw']
 
 
-class TrackingRaw(domain_object.DomainObject, BaseModel):  # type: ignore
+class TrackingRaw(domain_object.DomainObject, BaseModel):
 
-    __tablename__ = 'tracking_raw'
-
-    user_key = Column("user_key", types.Unicode(100), nullable=False,
-                      primary_key=True)
-    url = Column("url", types.UnicodeText, nullable=False, primary_key=True)
-    tracking_type = Column("tracking_type", types.Unicode(10),
-                           nullable=False)
-    access_timestamp = Column("access_timestamp", types.DateTime,
-                              primary_key=True, default=datetime.datetime.now)
+    __table__ = Table(
+        "tracking_raw",
+        BaseModel.metadata,
+        Column("user_key", types.Unicode(100), nullable=False, primary_key=True),
+        Column("url", types.UnicodeText, nullable=False, primary_key=True),
+        Column("tracking_type", types.Unicode(10), nullable=False),
+        Column(
+            "access_timestamp",
+            types.DateTime,
+            primary_key=True,
+            default=datetime.datetime.now
+        ),
+    )
 
     def __init__(self, user_key: str,
                  url: str,
@@ -66,19 +70,19 @@ def create(cls, **kw: _types.Any) -> TrackingRaw:
 Index('tracking_raw_access_timestamp', 'access_timestamp')
 
 
-class TrackingSummary(domain_object.DomainObject, BaseModel):  # type: ignore
-
-    __tablename__ = 'tracking_summary'
+class TrackingSummary(domain_object.DomainObject, BaseModel):
 
-    url = Column("url", types.UnicodeText, nullable=False, primary_key=True)
-    package_id = Column("package_id", types.UnicodeText)
-    tracking_type = Column("tracking_type", types.Unicode(10), nullable=False)
-    count = Column("count", types.Integer, nullable=False)  # type: ignore
-    running_total = Column("running_total", types.Integer, nullable=False,
-                           server_default='0')
-    recent_views = Column("recent_views", types.Integer, nullable=False,
-                          server_default='0')
-    tracking_date = Column("tracking_date", types.Date)
+    __table__ = Table(
+        "tracking_summary",
+        BaseModel.metadata,
+        Column("url", types.UnicodeText, nullable=False, primary_key=True),
+        Column("package_id", types.UnicodeText),
+        Column("tracking_type", types.Unicode(10), nullable=False),
+        Column("count", types.Integer, nullable=False),
+        Column("running_total", types.Integer, nullable=False, server_default="0"),
+        Column("recent_views", types.Integer, nullable=False, server_default="0"),
+        Column("tracking_date", types.Date)
+    )
 
     def __init__(self,
                  url: str,
@@ -141,5 +145,5 @@ def get_for_resource(cls, url: str) -> dict[str, int]:
 
 
 Index('tracking_summary_url', TrackingSummary.url)
-Index('tracking_summary_package_id', TrackingSummary.package_id)  # type: ignore
+Index('tracking_summary_package_id', TrackingSummary.package_id)
 Index('tracking_summary_date', 'tracking_date')