Added some event codes and log trains for some basic API Connector ac…

…tions

octopoes/octopoes/connector/octopoes.py

@@ -27,6 +27,7 @@
 from octopoes.models.transaction import TransactionRecord
 from octopoes.models.tree import ReferenceTree
 from octopoes.models.types import OOIType
+from octopoes.types import DECLARATION_CREATED, OBSERVATION_CREATED, ORIGIN_DELETED
 
 
 class OctopoesAPIConnector:
@@ -176,14 +177,16 @@ def delete_origin(self, origin_id: str, valid_time: datetime) -> None:
 
         self.session.delete(f"/{self.client}/origins", params=params)
 
+        self.logger.info("Deleted origin", origin_id=origin_id, valid_time=valid_time, event_code=ORIGIN_DELETED)
+
     def save_observation(self, observation: Observation) -> None:
         self.session.post(
             f"/{self.client}/observations",
             headers={"Content-Type": "application/json"},
             content=observation.model_dump_json(),
         )
 
-        self.logger.info("Saved observation", observation=observation)
+        self.logger.info("Saved observation", observation=observation, event_code=OBSERVATION_CREATED)
 
     def save_declaration(self, declaration: Declaration) -> None:
         self.session.post(
@@ -192,7 +195,7 @@ def save_declaration(self, declaration: Declaration) -> None:
             content=declaration.model_dump_json(),
         )
 
-        self.logger.info("Saved declaration", declaration=declaration)
+        self.logger.info("Saved declaration", declaration=declaration, event_code=DECLARATION_CREATED)
 
     def save_affirmation(self, affirmation: Affirmation) -> None:
         self.session.post(
@@ -201,7 +204,7 @@ def save_affirmation(self, affirmation: Affirmation) -> None:
             content=affirmation.model_dump_json(),
         )
 
-        self.logger.info("Saved affirmation", affirmation=affirmation)
+        self.logger.info("Saved affirmation", affirmation=affirmation, event_code=DECLARATION_CREATED)
 
     def save_scan_profile(self, scan_profile: ScanProfile, valid_time: datetime):
         params = {"valid_time": str(valid_time)}

octopoes/octopoes/core/service.py

@@ -2,10 +2,10 @@
 from collections import Counter
 from collections.abc import Callable, ValuesView
 from datetime import datetime, timezone
-from logging import getLogger
 from time import perf_counter
 from typing import Literal, overload
 
+import structlog
 from bits.definitions import get_bit_definitions
 from bits.runner import BitRunner
 from pydantic import TypeAdapter
@@ -47,7 +47,7 @@
 from octopoes.repositories.scan_profile_repository import ScanProfileRepository
 from octopoes.xtdb.client import Operation, OperationType, XTDBSession
 
-logger = getLogger(__name__)
+logger = structlog.get_logger("octopoes-core-service")
 settings = Settings()
 
 

octopoes/octopoes/types.py

@@ -0,0 +1,5 @@
+# Event codes for certain actions
+OBSERVATION_CREATED = 100101
+DECLARATION_CREATED = 100201
+AFFIRMATION_CREATED = 100301
+ORIGIN_DELETED = 100403