Merge pull request #283 from investigativedata/develop

v0.6.8

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.7
+current_version = 0.6.8
 commit = True
 tag = True
 message = 🔖 Bump version: {current_version} → {new_version}

.github/workflows/docker.yml

@@ -37,7 +37,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/python.yml

@@ -15,8 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # python-version: ["3.11", "3.12"]
-        python-version: ["3.11"]
+        python-version: ["3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -50,7 +50,7 @@ repos:
         exclude: (test_[\w]+\.py|\.csv|\.json|\.lock)$
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         exclude: (test_[\w]+\.py|\.csv|\.i?json|\.lock)$

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-bookworm
+FROM python:3.12-bookworm
 
 RUN apt-get -qq update && apt-get -qq -y upgrade
 RUN apt-get install -qq -y pkg-config libicu-dev libleveldb-dev

VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

ftmq/__init__.py

@@ -1,4 +1,4 @@
 from ftmq.query import Query
 
-__version__ = "0.6.7"
+__version__ = "0.6.8"
 __all__ = ["Query"]

ftmq/io.py

@@ -7,6 +7,7 @@
 from nomenklatura.entity import CE, CompositeEntity
 from nomenklatura.util import PathLike
 
+from ftmq.exceptions import ValidationError
 from ftmq.query import Query
 from ftmq.store import Store, get_store
 from ftmq.types import CEGenerator, SDict
@@ -49,7 +50,10 @@ def smart_read_proxies(
         proxies = (make_proxy(line) for line in lines)
         yield from q.apply_iter(proxies)
     else:
-        yield from lines
+        for line in lines:
+            if line.get("id") is None:
+                raise ValidationError("Entity has no ID.")
+            yield line
 
 
 def smart_write_proxies(

ftmq/query.py

@@ -97,6 +97,10 @@ def __bool__(self) -> bool:
         """
         return bool(self.to_dict())
 
+    def __hash__(self) -> int:
+        # generate unique key of the current state
+        return hash(repr(self.to_dict()))
+
     def _chain(self, **kwargs):
         # merge current state
         new_kwargs = self.__dict__.copy()