allow all concepts in tag.category

graphsense · Apr 22, 2024 · 3aa09bf · 3aa09bf
1 parent 64a3637
commit 3aa09bf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [24.01.2] 2024-03-22
+### changed
+- allow all concepts to be used in category field (align category and concepts)
+
 ## [24.01.1] 2024-01-09
 ### changed
 - switched to calver

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 PROJECT := tagpack-tool
 VENV := .venv
-RELEASE := 'v24.01.1'
+RELEASE := 'v24.01.2'
 # RELEASESEM := 'v1.9.0'
 
 all: format lint test build

diff --git a/src/tagpack/conf/tagpack_schema.yaml b/src/tagpack/conf/tagpack_schema.yaml
@@ -44,7 +44,7 @@ tag:
   category:
     type: text
     mandatory: false
-    taxonomy: entity
+    taxonomy: concept
   abuse:
     type: text
     mandatory: false

diff --git a/src/tagpack/db/concepts.yaml b/src/tagpack/db/concepts.yaml
@@ -295,6 +295,15 @@ terrorism:
   seeAlso: https://gifct.org/wp-content/uploads/2021/07/GIFCT-TaxonomyReport-2021.pdf
   broader: extremism
 
+terrorism_financing:
+  id: terrorism_financing
+  type: concept
+  prefLabel: Terrorism Financing
+  description: >
+    Financial support to terrorism related entities
+  seeAlso: https://gifct.org/wp-content/uploads/2021/07/GIFCT-TaxonomyReport-2021.pdf
+  broader: extremism
+
 dark_web:
   id: dark_web
   type: concept

diff --git a/tests/test_tagpack_schema.py b/tests/test_tagpack_schema.py
@@ -15,13 +15,13 @@ def schema(monkeypatch):
 
 @pytest.fixture
 def taxonomies():
-    tax_entity = Taxonomy("entity", "http://example.com/entity")
+    tax_entity = Taxonomy("concept", "http://example.com/entity")
     tax_entity.add_concept("exchange", "Exchange", None, "Some description")
 
     tax_abuse = Taxonomy("abuse", "http://example.com/abuse")
     tax_abuse.add_concept("bad_coding", "Bad coding", None, "Really bad")
 
-    taxonomies = {"entity": tax_entity, "abuse": tax_abuse}
+    taxonomies = {"concept": tax_entity, "abuse": tax_abuse}
     return taxonomies
 
 
@@ -101,7 +101,7 @@ def test_field_type(schema):
 
 
 def test_field_taxonomy(schema):
-    assert schema.field_taxonomy("category") == "entity"
+    assert schema.field_taxonomy("category") == "concept"
 
 
 def test_field_no_taxonomy(schema):