Merge pull request #237 from investigativedata/develop

v0.6.4

.bumpversion.cfg

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

VERSION

@@ -1 +1 @@
-0.6.2
+0.6.4

ftmq/__init__.py

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

ftmq/model/dataset.py

@@ -15,6 +15,7 @@
 
 Frequencies = Literal[tuple(Frequencies)]
 Categories = Literal[tuple(Categories)]
+ContentType = Literal["documents", "structured", "mixed"]
 
 C = TypeVar("C", bound="Catalog")
 DS = TypeVar("DS", bound="Dataset")
@@ -79,6 +80,9 @@ class Dataset(BaseModel):
     countries: list[str] | None = []
     info_url: HttpUrl | None = None
     data_url: HttpUrl | None = None
+    aleph_url: HttpUrl | None = None
+    tags: list[str] | None = []
+    content_type: ContentType | None = "structured"
 
     git_repo: AnyUrl | None = None
     uri: str | None = None

js/model/dataset.ts

@@ -34,6 +34,8 @@ export type TDatasetFrequency =
     )
   | null;
 
+export type TContentType = "documents" | "structured" | "mixed";
+
 export interface IPublisher {
   readonly name: string;
   readonly url?: string | null;
@@ -116,6 +118,8 @@ export interface IDataset {
   readonly git_repo?: string | null;
   readonly uri?: string | null;
   readonly maintainer?: IMaintainer | null;
+  readonly content_type?: TContentType | null;
+  readonly aleph_url?: string | null;
 }
 
 export interface ICatalog {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@investigativedata/ftmq",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "javascript interface for ftmq",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ftmq"
-version = "0.6.2"
+version = "0.6.4"
 description = "followthemoney query dsl and io helpers"
 authors = ["Simon Wörpel <simon.woerpel@pm.me>"]
 license = "MIT"
@@ -26,21 +26,21 @@ ftmq = "ftmq.cli:cli"
 [tool.poetry.dependencies]
 python = ">=3.11,<3.12"
 banal = "^1.0.6"
-followthemoney = "^3.5.9"
-orjson = "^3.9.15"
-PyICU = "^2.12"
+followthemoney = "^3.6.0"
+orjson = "^3.10.3"
+PyICU = "^2.13.1"
 click = "^8.1.7"
 click-default-group = "^1.2.4"
-cryptography = "^42.0.4"
+cryptography = "^42.0.7"
 certifi = ">=2024.2.2"
-scipy = "^1.12.0"
-pydantic = "^2.6.2"
-sqlalchemy = "^2.0.27"
-alephclient = "^2.3.6"
+pydantic = "^2.7.1"
+sqlalchemy = "^2.0.30"
+alephclient = "^2.4.1"
 pycountry = "^23.12.11"
 urllib3 = "<3"
-nomenklatura = "^3.10.4"
+nomenklatura = "^3.10.6"
 anystore = "^0.1.3"
+pantomime = "^0.6.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.4.3,<9.0.0"