Check .logfire for creds to respect 'if-token-present' setting

logfire/_internal/config.py

@@ -801,16 +801,21 @@ def add_span_processor(span_processor: SpanProcessor) -> None:
             if isinstance(self.metrics, MetricsOptions):
                 metric_readers = list(self.metrics.additional_readers)
 
+            creds_from_file = LogfireCredentials.load_creds_file(self.data_dir)
+            # token from creds file takes the lowest priority
+            if self.token is None and creds_from_file is not None:
+                self.token = creds_from_file.token
+                self.advanced.base_url = self.advanced.base_url or creds_from_file.logfire_api_url
+
             if (self.send_to_logfire == 'if-token-present' and self.token is not None) or self.send_to_logfire is True:
                 show_project_link = self.console and self.console.show_project_link
 
                 if self.token is None:
-                    if (credentials := LogfireCredentials.load_creds_file(self.data_dir)) is None:  # pragma: no branch
-                        credentials = LogfireCredentials.initialize_project(
-                            logfire_api_url=self.advanced.base_url,
-                            session=requests.Session(),
-                        )
-                        credentials.write_creds_file(self.data_dir)
+                    credentials = LogfireCredentials.initialize_project(
+                        logfire_api_url=self.advanced.base_url,
+                        session=requests.Session(),
+                    )
+                    credentials.write_creds_file(self.data_dir)
                     self.token = credentials.token
                     self.advanced.base_url = self.advanced.base_url or credentials.logfire_api_url
                     if show_project_link:  # pragma: no branch

tests/test_configure.py

@@ -1297,6 +1297,29 @@ def test_send_to_logfire_if_token_present_not_empty(capsys: pytest.CaptureFixtur
         del os.environ['LOGFIRE_TOKEN']
 
 
+def test_send_to_logfire_if_token_present_in_logfire_dir(tmp_path: Path, capsys: pytest.CaptureFixture[str]) -> None:
+    creds_file = tmp_path / 'logfire_credentials.json'
+    creds_file.write_text(
+        """
+        {
+            "token": "foobar",
+            "project_name": "myproject",
+            "project_url": "http://dash.localhost:8000/",
+            "logfire_api_url": "http://dash.localhost:8000/"
+        }
+        """
+    )
+    with requests_mock.Mocker() as request_mocker:
+        request_mocker.get(
+            'https://logfire-api.pydantic.dev/v1/info',
+            json={'project_name': 'myproject', 'project_url': 'http://dash.localhost:8000/'},
+        )
+        configure(send_to_logfire='if-token-present', data_dir=tmp_path)
+        wait_for_check_token_thread()
+        assert len(request_mocker.request_history) == 1
+        assert capsys.readouterr().err == 'Logfire project URL: http://dash.localhost:8000/\n'
+
+
 def test_load_creds_file_invalid_json_content(tmp_path: Path):
     creds_file = tmp_path / 'logfire_credentials.json'
     creds_file.write_text('invalid-data')