support better search and tag derivation via pubkey

soad003 · soad003 · commit 4c6d1e2d7375 · 2025-10-23T17:00:56.000+02:00
diff --git a/clients/python/docs/AddressTag.md b/clients/python/docs/AddressTag.md
@@ -21,7 +21,7 @@ Name | Type | Description | Notes
 **lastmod** | **int** | Last modified | [optional] 
 **confidence** | **str** | Confidence name | [optional] 
 **confidence_level** | **int** | Confidence level | [optional] 
-**inherited_from** | **str** | if the tag was inherited from cluster | [optional]  if omitted the server will use the default value of "cluster"
+**inherited_from** | **str** | if the tag was inherited from cluster | [optional] 
 **entity** | **int** | Entity id | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
diff --git a/clients/python/docs/LabelSummary.md b/clients/python/docs/LabelSummary.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **sources** | **[str]** |  | 
 **concepts** | **[str]** |  | 
 **lastmod** | **int** |  | 
-**inherited_from** | **str** | if the tag was inherited from cluster | [optional]  if omitted the server will use the default value of "cluster"
+**inherited_from** | **str** | if the tag was inherited from cluster | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/clients/python/docs/Tag.md b/clients/python/docs/Tag.md
@@ -20,7 +20,7 @@ Name | Type | Description | Notes
 **lastmod** | **int** | Last modified | [optional] 
 **confidence** | **str** | Confidence name | [optional] 
 **confidence_level** | **int** | Confidence level | [optional] 
-**inherited_from** | **str** | if the tag was inherited from cluster | [optional]  if omitted the server will use the default value of "cluster"
+**inherited_from** | **str** | if the tag was inherited from cluster | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/clients/python/graphsense/model/address_tag.py b/clients/python/graphsense/model/address_tag.py
@@ -63,6 +63,8 @@ class AddressTag(ModelComposed):
     allowed_values = {
         ('inherited_from',): {
             'CLUSTER': "cluster",
+            'PUBKEY': "pubkey",
+            'PUBKEY_AND_CLUSTER': "pubkey_and_cluster",
         },
     }
 
@@ -196,7 +198,7 @@ def _from_openapi_data(cls, *args, **kwargs):  # noqa: E501
             lastmod (int): Last modified. [optional]  # noqa: E501
             confidence (str): Confidence name. [optional]  # noqa: E501
             confidence_level (int): Confidence level. [optional]  # noqa: E501
-            inherited_from (str): if the tag was inherited from cluster. [optional] if omitted the server will use the default value of "cluster"  # noqa: E501
+            inherited_from (str): if the tag was inherited from cluster. [optional]  # noqa: E501
             entity (int): Entity id. [optional]  # noqa: E501
         """
 
@@ -314,7 +316,7 @@ def __init__(self, *args, **kwargs):  # noqa: E501
             lastmod (int): Last modified. [optional]  # noqa: E501
             confidence (str): Confidence name. [optional]  # noqa: E501
             confidence_level (int): Confidence level. [optional]  # noqa: E501
-            inherited_from (str): if the tag was inherited from cluster. [optional] if omitted the server will use the default value of "cluster"  # noqa: E501
+            inherited_from (str): if the tag was inherited from cluster. [optional]  # noqa: E501
             entity (int): Entity id. [optional]  # noqa: E501
         """
 
diff --git a/clients/python/graphsense/model/label_summary.py b/clients/python/graphsense/model/label_summary.py
@@ -57,6 +57,8 @@ class LabelSummary(ModelNormal):
     allowed_values = {
         ('inherited_from',): {
             'CLUSTER': "cluster",
+            'PUBKEY': "pubkey",
+            'PUBKEY_AND_CLUSTER': "pubkey_and_cluster",
         },
     }
 
@@ -163,7 +165,7 @@ def _from_openapi_data(cls, label, count, confidence, relevance, creators, sourc
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            inherited_from (str): if the tag was inherited from cluster. [optional] if omitted the server will use the default value of "cluster"  # noqa: E501
+            inherited_from (str): if the tag was inherited from cluster. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -263,7 +265,7 @@ def __init__(self, label, count, confidence, relevance, creators, sources, conce
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            inherited_from (str): if the tag was inherited from cluster. [optional] if omitted the server will use the default value of "cluster"  # noqa: E501
+            inherited_from (str): if the tag was inherited from cluster. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/clients/python/graphsense/model/tag.py b/clients/python/graphsense/model/tag.py
@@ -57,6 +57,8 @@ class Tag(ModelNormal):
     allowed_values = {
         ('inherited_from',): {
             'CLUSTER': "cluster",
+            'PUBKEY': "pubkey",
+            'PUBKEY_AND_CLUSTER': "pubkey_and_cluster",
         },
     }
 
@@ -187,7 +189,7 @@ def _from_openapi_data(cls, label, tagpack_title, tagpack_is_public, tagpack_cre
             lastmod (int): Last modified. [optional]  # noqa: E501
             confidence (str): Confidence name. [optional]  # noqa: E501
             confidence_level (int): Confidence level. [optional]  # noqa: E501
-            inherited_from (str): if the tag was inherited from cluster. [optional] if omitted the server will use the default value of "cluster"  # noqa: E501
+            inherited_from (str): if the tag was inherited from cluster. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -294,7 +296,7 @@ def __init__(self, label, tagpack_title, tagpack_is_public, tagpack_creator, is_
             lastmod (int): Last modified. [optional]  # noqa: E501
             confidence (str): Confidence name. [optional]  # noqa: E501
             confidence_level (int): Confidence level. [optional]  # noqa: E501
-            inherited_from (str): if the tag was inherited from cluster. [optional] if omitted the server will use the default value of "cluster"  # noqa: E501
+            inherited_from (str): if the tag was inherited from cluster. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
diff --git a/gsrest/config.py b/gsrest/config.py
@@ -54,6 +54,10 @@ class GSRestConfig(BaseSettings):
     address_links_request_timeout: float = Field(
         default=30, description="Timeout for address links requests endpoint"
     )
+    include_pubkey_derived_tags: bool = Field(
+        default=True,
+        description="Include pubkey derived tags in tag summaries and lists",
+    )
     user_tag_reporting_acl_group: str = Field(
         default="develop",
         alias="user-tag-reporting-acl-group",
@@ -64,6 +68,10 @@ class GSRestConfig(BaseSettings):
         alias="enable-user-tag-reporting",
         description="Enable user tag reporting functionality",
     )
+    privacy_preserving_tag_notifications: bool = Field(
+        default=True,
+        description="Enable privacy preserving tag notifications",
+    )
     included_bridges: Tuple[str, ...] = Field(
         default_factory=tuple,
         description="Included bridges in tx conversions",
diff --git a/gsrest/dependencies.py b/gsrest/dependencies.py
@@ -90,7 +90,6 @@ def __init__(
         )
         self._entities_service = EntitiesService(
             db=db,
-            tagstore=self.tagstore_db,
             tags_service=self._tags_service,
             blocks_service=self._blocks_service,
             rates_service=self._rates_service,
@@ -99,7 +98,6 @@ def __init__(
 
         self._addresses_service = AddressesService(
             db=db,
-            tagstore=self.tagstore_db,
             tags_service=self._tags_service,
             entities_service=self._entities_service,
             blocks_service=self._blocks_service,
diff --git a/gsrest/service/addresses_service.py b/gsrest/service/addresses_service.py
@@ -44,9 +44,14 @@ async def get_tag_summary_by_address(
 ):
     services = get_service_container(request)
     tagstore_groups = get_tagstore_access_groups(request)
+    include_pubkey_derived_tags = request.app["config"].include_pubkey_derived_tags
 
     pydantic_result = await services.addresses_service.get_tag_summary_by_address(
-        currency, address, tagstore_groups, include_best_cluster_tag
+        currency,
+        address,
+        tagstore_groups,
+        include_best_cluster_tag,
+        include_pubkey_derived_tags=include_pubkey_derived_tags,
     )
 
     return pydantic_to_openapi(pydantic_result)
@@ -69,6 +74,7 @@ async def list_tags_by_address(
     services = get_service_container(request)
     tagstore_groups = get_tagstore_access_groups(request)
     cache = get_request_cache(request)
+    include_pubkey_derived_tags = request.app["config"].include_pubkey_derived_tags
 
     pydantic_result = await services.addresses_service.list_tags_by_address(
         currency,
@@ -78,6 +84,7 @@ async def list_tags_by_address(
         page,
         pagesize,
         include_best_cluster_tag,
+        include_pubkey_derived_tags=include_pubkey_derived_tags,
     )
 
     return pydantic_to_openapi(pydantic_result)
diff --git a/gsrest/test/tags_service.py b/gsrest/test/tags_service.py
@@ -1,5 +1,4 @@
 from openapi_server.models.address_tag import AddressTag
-from openapi_server.models.address_tags import AddressTags
 from openapi_server.models.concept import Concept
 
 base_tagpack_src = ""
@@ -415,10 +414,12 @@ async def list_address_tags(test_case):
         path_with_page, label="isolinks", pagesize=1, page=result["next_page"]
     )
     assert [t2] == result["address_tags"]
-    result = await test_case.request(
-        path_with_page, label="isolinks", pagesize=1, page=result["next_page"]
-    )
-    test_case.assertEqual(AddressTags(address_tags=[]).to_dict(), result)
+
+    assert result.get("next_page") is None
+    # result = await test_case.request(
+    #     path_with_page, label="isolinks", pagesize=1, page=result["next_page"]
+    # )
+    # test_case.assertEqual(AddressTags(address_tags=[]).to_dict(), result)
 
     result = await test_case.request(path, label="TagA")
     assert [eth_tag3.to_dict()] == result["address_tags"]
diff --git a/openapi_server/models/address_tag.py b/openapi_server/models/address_tag.py
@@ -493,7 +493,7 @@ def inherited_from(self, inherited_from):
         :param inherited_from: The inherited_from of this AddressTag.
         :type inherited_from: str
         """
-        allowed_values = ["cluster"]  # noqa: E501
+        allowed_values = ["cluster", "pubkey", "pubkey_and_cluster"]  # noqa: E501
         if inherited_from not in allowed_values:
             raise BadUserInputException(
                 "Invalid value for `inherited_from` ({0}), must be one of {1}"
diff --git a/openapi_server/models/label_summary.py b/openapi_server/models/label_summary.py
@@ -293,7 +293,7 @@ def inherited_from(self, inherited_from):
         :param inherited_from: The inherited_from of this LabelSummary.
         :type inherited_from: str
         """
-        allowed_values = ["cluster"]  # noqa: E501
+        allowed_values = ["cluster", "pubkey", "pubkey_and_cluster"]  # noqa: E501
         if inherited_from not in allowed_values:
             raise BadUserInputException(
                 "Invalid value for `inherited_from` ({0}), must be one of {1}"
diff --git a/openapi_server/models/tag.py b/openapi_server/models/tag.py
@@ -481,7 +481,7 @@ def inherited_from(self, inherited_from):
         :param inherited_from: The inherited_from of this Tag.
         :type inherited_from: str
         """
-        allowed_values = ["cluster"]  # noqa: E501
+        allowed_values = ["cluster", "pubkey", "pubkey_and_cluster"]  # noqa: E501
         if inherited_from not in allowed_values:
             raise BadUserInputException(
                 "Invalid value for `inherited_from` ({0}), must be one of {1}"
diff --git a/openapi_server/openapi/openapi.yaml b/openapi_server/openapi/openapi.yaml
@@ -3332,6 +3332,8 @@ components:
           description: if the tag was inherited from cluster
           enum:
             - cluster
+            - pubkey
+            - pubkey_and_cluster
           title: inherited_from
           type: string
       required:
@@ -4288,6 +4290,8 @@ components:
           description: if the tag was inherited from cluster
           enum:
             - cluster
+            - pubkey
+            - pubkey_and_cluster
           type: string
         tag_type:
           description: kind of tag e.g. Mention; representing a mention of an address, or Actor; representing an actor saying something about the actor behind the address.
diff --git a/openapi_spec/graphsense.yaml b/openapi_spec/graphsense.yaml
@@ -1331,6 +1331,8 @@ components:
           type: string
           enum:
             - cluster
+            - pubkey
+            - pubkey_and_cluster
           description: if the tag was inherited from cluster
     tag_summary:
       type: object
@@ -1776,6 +1778,8 @@ components:
           type: string
           enum:
             - cluster
+            - pubkey
+            - pubkey_and_cluster
           description: if the tag was inherited from cluster
         tag_type:
           type: string
diff --git a/pyproject.toml b/pyproject.toml
@@ -83,7 +83,8 @@ exclude = [
     "node_modules",
     "site-packages",
     "venv",
-    "openapi_server",
+    "openapi_server*",
+    "openapi_server/**",
     "tests/test_*.py",
     "setup.py",
     "clients/**"
@@ -92,6 +93,9 @@ exclude = [
 [tool.ruff.lint]
 extend-select = ["T201"]
 
+[tool.uv.sources]
+graphsense-lib = { git = "https://github.com/graphsense/graphsense-lib", rev = "v2.8.0-dev7" }
+
 [dependency-groups]
 dev = [
     "aiohttp-devtools>=1.1.2",
diff --git a/scripts/ensure_versions_alignment.py b/scripts/ensure_versions_alignment.py
@@ -12,8 +12,8 @@
 Exits with non-zero code if versions are misaligned.
 """
 
-import sys
 import re
+import sys
 from pathlib import Path
 
 files = [
diff --git a/uv.lock b/uv.lock
