clue-api 1.6.0.dev310__tar.gz → 1.6.0.dev323__tar.gz

{clue_api-1.6.0.dev310 → clue_api-1.6.0.dev323}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clue-api
-Version: 1.6.0.dev310
+Version: 1.6.0.dev323
 Summary: Clue distributed enrichment service
 License: MIT
 License-File: LICENSE

{clue_api-1.6.0.dev310 → clue_api-1.6.0.dev323}/clue/models/network.py

@@ -76,11 +76,6 @@ class ClueResponse(BaseModel):
 Timestamp = Annotated[
     datetime,
     BeforeValidator(parse_datetime),
-    Field(
-        description="A timestamp describing when the knowledge was generated.",
-        default_factory=lambda: datetime.now(timezone.utc),
-        examples=[datetime.now(timezone.utc), datetime.now(timezone.utc) - timedelta(weeks=2)],
-    ),
 ]
 
 
@@ -121,7 +116,11 @@ class Annotation(BaseModel):
             examples=["v0.0.1", "1.0.0", None],
         ),
     ] = None
-    timestamp: Timestamp
+    timestamp: Timestamp = Field(
+        description="A timestamp describing when the knowledge was generated.",
+        default_factory=lambda: datetime.now(timezone.utc),
+        examples=[datetime.now(timezone.utc), datetime.now(timezone.utc) - timedelta(weeks=2)],
+    )
     type: Annotated[
         Literal["opinion", "frequency", "assessment", "mitigation", "context"],
         Field(

{clue_api-1.6.0.dev310 → clue_api-1.6.0.dev323}/clue/security/__init__.py

@@ -1,8 +1,8 @@
 import functools
 from typing import Callable, Optional
 
-import elasticapm
 import requests
+from elasticapm.traces import set_user_context
 from flask import request
 from jwt import ExpiredSignatureError
 from prometheus_client import Counter
@@ -19,12 +19,8 @@ from clue.common.exceptions import (
     NotFoundException,
 )
 from clue.common.forge import APP_NAME
-from clue.common.logging import get_logger
-from clue.common.logging.audit import audit
 from clue.config import AUDIT, config
 
-logger = get_logger(__file__)
-
 SUCCESSFUL_ATTEMPTS = Counter(
     f"{APP_NAME.replace('-', '_')}_auth_success_total",
     "Successful Authentication Attempts",
@@ -95,6 +91,10 @@ class api_login(object):  # noqa: N801
         Returns:
             _type_: _description_
         """
+        from clue.common.logging import get_logger
+        from clue.common.logging.audit import audit
+
+        logger = get_logger(__file__)
 
         @functools.wraps(func)
         def base(*args, **kwargs):  # noqa: C901
@@ -189,7 +189,7 @@ class api_login(object):  # noqa: N801
                 return internal_error(err=e.message)
 
             if config.core.metrics.apm_server.server_url is not None:
-                elasticapm.set_user_context(
+                set_user_context(
                     username=user.get("name", None),
                     email=user.get("email", None),
                     user_id=user.get("uname", None),
@@ -201,11 +201,11 @@ class api_login(object):  # noqa: N801
             SUCCESSFUL_ATTEMPTS.inc()
             return func(*args, **kwargs)
 
-        base.protected = True
+        base.protected = True  # type: ignore
         # TODO: Fix type parsing and checks
         # base.required_type = self.required_type
-        base.audit = self.audit
-        base.required_priv = self.required_priv
-        base.required_method = self.required_method
-        base.check_xsrf_token = self.check_xsrf_token
+        base.audit = self.audit  # type: ignore
+        base.required_priv = self.required_priv  # type: ignore
+        base.required_method = self.required_method  # type: ignore
+        base.check_xsrf_token = self.check_xsrf_token  # type: ignore
         return base

{clue_api-1.6.0.dev310 → clue_api-1.6.0.dev323}/pyproject.toml

@@ -141,7 +141,7 @@ log_cli_level = "WARN"
 [tool.poetry]
 package-mode = true
 name = "clue-api"
-version = "1.6.0.dev310"
+version = "1.6.0.dev323"
 description = "Clue distributed enrichment service"
 authors = ["Canadian Centre for Cyber Security <contact@cyber.gc.ca>"]
 license = "MIT"