Merge pull request #1290 from roboflow/fix/pass-headers-to-send-usage-payloads

Move call to build_roboflow_api_headers from payload_helpers to collector

Author: PawelPeczek-Roboflow

inference/core/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.49.3"
+__version__ = "0.49.4"
 
 
 if __name__ == "__main__":

inference/usage_tracking/collector.py

@@ -35,10 +35,8 @@
     ROBOFLOW_INTERNAL_SERVICE_SECRET,
 )
 from inference.core.logger import logger
+from inference.core.roboflow_api import build_roboflow_api_headers
 from inference.core.version import __version__ as inference_version
-from inference.core.workflows.execution_engine.v1.compiler.entities import (
-    CompiledWorkflow,
-)
 
 from .config import TelemetrySettings, get_telemetry_settings
 from .decorator_helpers import (
@@ -55,7 +53,6 @@
     APIKeyHash,
     APIKeyUsage,
     ResourceCategory,
-    ResourceDetails,
     ResourceID,
     SystemDetails,
     UsagePayload,
@@ -536,6 +533,9 @@ def _offload_to_api(self, payloads: List[APIKeyUsage]):
                 api_usage_endpoint_url=self._settings.api_usage_endpoint_url,
                 hashes_to_api_keys=hashes_to_api_keys,
                 ssl_verify=ssl_verify,
+                headers=build_roboflow_api_headers(
+                    explicit_headers={"Authorization": f"Bearer {api_key}"}
+                ),
             )
             if api_keys_hashes_failed:
                 logger.debug(

inference/usage_tracking/payload_helpers.py

@@ -3,7 +3,8 @@
 
 import requests
 
-from inference.core.roboflow_api import build_roboflow_api_headers
+# NOTE: This module is used in isolation, no imports from inference are allowed
+
 
 ResourceID = str
 Usage = Union[DefaultDict[str, Any], Dict[str, Any]]
@@ -149,6 +150,7 @@ def send_usage_payload(
     api_usage_endpoint_url: str,
     hashes_to_api_keys: Optional[Dict[APIKeyHash, APIKey]] = None,
     ssl_verify: bool = False,
+    headers: Optional[Dict[str, str]] = None,
 ) -> Set[APIKeyHash]:
     hashes_to_api_keys = hashes_to_api_keys or {}
     api_keys_hashes_failed = set()
@@ -168,9 +170,6 @@ def send_usage_payload(
                 if "api_key_hash" in workflow_payload:
                     del workflow_payload["api_key_hash"]
                 workflow_payload["api_key"] = api_key
-            headers = build_roboflow_api_headers(
-                explicit_headers={"Authorization": f"Bearer {api_key}"}
-            )
             response = requests.post(
                 api_usage_endpoint_url,
                 json=complete_workflow_payloads,