devlogs 2.3.4__tar.gz → 2.3.5__tar.gz

{devlogs-2.3.4/src/devlogs.egg-info → devlogs-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlogs
-Version: 2.3.4
+Version: 2.3.5
 Summary: Developer-focused logging library for Python with OpenSearch integration.
 Author-email: Dan Driscoll <dan@thedandriscoll.org>
 License: MIT License

{devlogs-2.3.4 → devlogs-2.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devlogs"
-version = "2.3.4"
+version = "2.3.5"
 description = "Developer-focused logging library for Python with OpenSearch integration."
 requires-python = ">=3.11"
 readme = "README.md"

{devlogs-2.3.4 → devlogs-2.3.5}/src/devlogs/_version_static.py

@@ -1,2 +1,2 @@
 # AUTO-GENERATED at build time — do not edit or commit
-__version__ = "2.3.4"
+__version__ = "2.3.5"

{devlogs-2.3.4 → devlogs-2.3.5}/src/devlogs/cli.py

@@ -926,6 +926,13 @@ def tail(
 	_apply_common_options(env, url)
 
 	cfg = load_config()
+	if cfg.url_mode == "collector":
+		typer.echo(typer.style(
+			"Error: the provided URL is a collector (ingest) endpoint and cannot be used for querying.\n"
+			"For Loki backends, use lokis://TOKEN@host/path instead of https://TOKEN@host/path",
+			fg=typer.colors.RED
+		), err=True)
+		raise typer.Exit(1)
 	if cfg.is_loki:
 		_tail_loki(cfg, application=application, operation_id=operation_id, area=area,
 			component=component, level=level, since=since, limit=limit, follow=follow,
@@ -1115,6 +1122,13 @@ def search(
 	_apply_common_options(env, url)
 
 	cfg = load_config()
+	if cfg.url_mode == "collector":
+		typer.echo(typer.style(
+			"Error: the provided URL is a collector (ingest) endpoint and cannot be used for querying.\n"
+			"For Loki backends, use lokis://TOKEN@host/path instead of https://TOKEN@host/path",
+			fg=typer.colors.RED
+		), err=True)
+		raise typer.Exit(1)
 	if cfg.is_loki:
 		_search_loki(cfg, q=q, application=application, area=area,
 			component=component, level=level, operation_id=operation_id,

{devlogs-2.3.4 → devlogs-2.3.5}/src/devlogs/config.py

@@ -414,8 +414,9 @@ class DevlogsConfig:
 				# Treat unparseable DEVLOGS_URL as legacy OpenSearch
 				opensearch_url_config = _parse_opensearch_url(devlogs_url)
 
-		# Legacy: DEVLOGS_OPENSEARCH_URL overrides OpenSearch settings from DEVLOGS_URL
-		if legacy_opensearch_url:
+		# Legacy: DEVLOGS_OPENSEARCH_URL overrides OpenSearch settings from DEVLOGS_URL,
+		# but NOT when the URL was explicitly set via --url flag.
+		if legacy_opensearch_url and not _url_set_explicitly:
 			opensearch_url_config = _parse_opensearch_url(legacy_opensearch_url)
 			# Parse application filter from opensearch:// URL (second path segment)
 			if legacy_opensearch_url.startswith("opensearchs://") or legacy_opensearch_url.startswith("opensearch://"):
@@ -539,15 +540,22 @@ def set_dotenv_path(path: str):
 	_dotenv_loaded = False  # Reset to force reload with new path
 
 
+_url_set_explicitly = False
+
 def set_url(url: str):
 	"""Set the URL, auto-detecting whether it's a collector or OpenSearch URL.
 
 	Uses parse_url() to detect the URL type:
 	- Collector URLs → sets DEVLOGS_URL
 	- OpenSearch URLs → sets DEVLOGS_OPENSEARCH_URL
+
+	When called (i.e. via --url flag), marks the URL as explicitly set so that
+	dotenv values cannot silently override it.
 	"""
+	global _url_set_explicitly
 	if not url:
 		return
+	_url_set_explicitly = True
 	try:
 		parsed = parse_url(url)
 	except URLParseError:

{devlogs-2.3.4 → devlogs-2.3.5/src/devlogs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlogs
-Version: 2.3.4
+Version: 2.3.5
 Summary: Developer-focused logging library for Python with OpenSearch integration.
 Author-email: Dan Driscoll <dan@thedandriscoll.org>
 License: MIT License

{devlogs-2.3.4 → devlogs-2.3.5}/tests/test_cli.py

@@ -919,3 +919,25 @@ class TestLokiCLI:
         result = runner.invoke(cli.app, ["--url", "lokis://token@host.example.io/query", "last-error"])
         assert result.exit_code == 1
         assert "--application is required" in result.output
+
+    def test_tail_rejects_collector_url(self, monkeypatch):
+        """Test that tail fails with a clear error for collector (https) URLs."""
+        monkeypatch.setattr(config, "_dotenv_loaded", True)
+        monkeypatch.delenv("DEVLOGS_OPENSEARCH_URL", raising=False)
+        monkeypatch.delenv("DEVLOGS_OPENSEARCH_HOST", raising=False)
+        runner = CliRunner()
+        result = runner.invoke(cli.app, ["--url", "https://token@host.example.io/ingest", "tail"])
+        assert result.exit_code == 1
+        assert "collector" in result.output
+        assert "lokis://" in result.output
+
+    def test_search_rejects_collector_url(self, monkeypatch):
+        """Test that search fails with a clear error for collector (https) URLs."""
+        monkeypatch.setattr(config, "_dotenv_loaded", True)
+        monkeypatch.delenv("DEVLOGS_OPENSEARCH_URL", raising=False)
+        monkeypatch.delenv("DEVLOGS_OPENSEARCH_HOST", raising=False)
+        runner = CliRunner()
+        result = runner.invoke(cli.app, ["--url", "https://token@host.example.io/ingest", "search"])
+        assert result.exit_code == 1
+        assert "collector" in result.output
+        assert "lokis://" in result.output