Merge branch 'main' into release/1.4

Author: akaszynski

.pre-commit-config.yaml

@@ -5,12 +5,12 @@ ci:
   autoupdate_schedule: quarterly
 repos:
 - repo: https://github.com/keewis/blackdoc
-  rev: v0.4.5
+  rev: v0.4.6
   hooks:
   - id: blackdoc
     files: \.py$
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.3
+  rev: v0.14.10
   hooks:
   - id: ruff-check
     args: [--fix, --exit-non-zero-on-fix]
@@ -28,7 +28,7 @@ repos:
     additional_dependencies: [toml]
     exclude: tests/
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.21.0
+  rev: v3.21.2
   hooks:
   - id: pyupgrade
     args: [--py39-plus, --keep-runtime-typing]

src/keepa/__init__.py

@@ -8,23 +8,20 @@
 except PackageNotFoundError:
     __version__ = "unknown"
 
-from keepa.data_models import ProductParams
-from keepa.interface import (
-    DCODES,
-    KEEPA_ST_ORDINAL,
-    SCODES,
-    AsyncKeepa,
-    Domain,
-    Keepa,
+from keepa.constants import DCODES, KEEPA_ST_ORDINAL, SCODES, csv_indices
+from keepa.keepa_async import AsyncKeepa
+from keepa.keepa_sync import Keepa
+from keepa.models.domain import Domain
+from keepa.models.product_params import ProductParams
+from keepa.plotting import plot_product
+from keepa.utils import (
     convert_offer_history,
-    csv_indices,
     format_items,
     keepa_minutes_to_time,
     parse_csv,
     process_used_buybox,
     run_and_get,
 )
-from keepa.plotting import plot_product
 
 __all__ = [
     "AsyncKeepa",

src/keepa/constants.py

@@ -0,0 +1,78 @@
+"""Constants for Keepa API interactions."""
+
+import numpy as np
+
+# hardcoded ordinal time from
+KEEPA_ST_ORDINAL = np.datetime64("2011-01-01")
+
+# Request limit
+REQUEST_LIMIT = 100
+
+# Status code dictionary/key
+SCODES = {
+    "400": "REQUEST_REJECTED",
+    "402": "PAYMENT_REQUIRED",
+    "405": "METHOD_NOT_ALLOWED",
+    "429": "NOT_ENOUGH_TOKEN",
+}
+
+# domain codes
+# Valid values: [ 1: com | 2: co.uk | 3: de | 4: fr | 5:
+#                 co.jp | 6: ca | 7: cn | 8: it | 9: es | 10: in | 11: com.mx | 12: com.br ]
+DCODES = [
+    "RESERVED",
+    "US",
+    "GB",
+    "DE",
+    "FR",
+    "JP",
+    "CA",
+    "CN",
+    "IT",
+    "ES",
+    "IN",
+    "MX",
+    "BR",
+]
+# developer note: appears like CN (China) has changed to RESERVED2
+
+# csv indices. used when parsing csv and stats fields.
+# https://github.com/keepacom/api_backend
+# see api_backend/src/main/java/com/keepa/api/backend/structs/Product.java
+# [index in csv, key name, isfloat(is price or rating)]
+csv_indices: list[tuple[int, str, bool]] = [
+    (0, "AMAZON", True),
+    (1, "NEW", True),
+    (2, "USED", True),
+    (3, "SALES", False),
+    (4, "LISTPRICE", True),
+    (5, "COLLECTIBLE", True),
+    (6, "REFURBISHED", True),
+    (7, "NEW_FBM_SHIPPING", True),
+    (8, "LIGHTNING_DEAL", True),
+    (9, "WAREHOUSE", True),
+    (10, "NEW_FBA", True),
+    (11, "COUNT_NEW", False),
+    (12, "COUNT_USED", False),
+    (13, "COUNT_REFURBISHED", False),
+    (14, "CollectableOffers", False),
+    (15, "EXTRA_INFO_UPDATES", False),
+    (16, "RATING", True),
+    (17, "COUNT_REVIEWS", False),
+    (18, "BUY_BOX_SHIPPING", True),
+    (19, "USED_NEW_SHIPPING", True),
+    (20, "USED_VERY_GOOD_SHIPPING", True),
+    (21, "USED_GOOD_SHIPPING", True),
+    (22, "USED_ACCEPTABLE_SHIPPING", True),
+    (23, "COLLECTIBLE_NEW_SHIPPING", True),
+    (24, "COLLECTIBLE_VERY_GOOD_SHIPPING", True),
+    (25, "COLLECTIBLE_GOOD_SHIPPING", True),
+    (26, "COLLECTIBLE_ACCEPTABLE_SHIPPING", True),
+    (27, "REFURBISHED_SHIPPING", True),
+    (28, "EBAY_NEW_SHIPPING", True),
+    (29, "EBAY_USED_SHIPPING", True),
+    (30, "TRADE_IN", True),
+    (31, "RENT", False),
+]
+
+_SELLER_TIME_DATA_KEYS = ["trackedSince", "lastUpdate"]