loki-reader-core 0.2.2__tar.gz → 0.2.3__tar.gz

{loki_reader_core-0.2.2 → loki_reader_core-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: loki-reader-core
-Version: 0.2.2
+Version: 0.2.3
 Summary: Python library for querying Grafana Loki logs via REST API
 Project-URL: Homepage, https://github.com/jmazzahacks/loki-reader-core
 Project-URL: Issues, https://github.com/jmazzahacks/loki-reader-core/issues

{loki_reader_core-0.2.2 → loki_reader_core-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "loki-reader-core"
-version = "0.2.2"
+version = "0.2.3"
 authors = [
   { name="Jason Byteforge", email="jason@mzmail.me" },
 ]

{loki_reader_core-0.2.2 → loki_reader_core-0.2.3}/src/loki_reader_core/__init__.py

@@ -6,7 +6,7 @@ from .client import LokiClient
 from .exceptions import LokiAuthError, LokiConnectionError, LokiError, LokiQueryError
 from .models import LogEntry, LogStream, MetricSample, MetricSeries, QueryResult, QueryStats
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 __all__ = [
     "LokiClient",

{loki_reader_core-0.2.2 → loki_reader_core-0.2.3}/src/loki_reader_core/client.py

@@ -301,9 +301,8 @@ class LokiClient:
         if app_value in self._app_label_cache:
             return self._app_label_cache[app_value]
 
-        start, end = self._discovery_time_range()
         for label_name in APP_LABEL_NAMES:
-            values = self.get_label_values(label_name, start=start, end=end)
+            values = self.get_label_values(label_name)
             if app_value in values:
                 self._app_label_cache[app_value] = label_name
                 return label_name
@@ -325,9 +324,8 @@ class LokiClient:
         if self._severity_label_cache is not None:
             return self._severity_label_cache
 
-        start, end = self._discovery_time_range()
         for label_name in SEVERITY_LABEL_NAMES:
-            values = self.get_label_values(label_name, start=start, end=end)
+            values = self.get_label_values(label_name)
             if values:
                 self._severity_label_cache = label_name
                 return label_name
@@ -452,6 +450,10 @@ class LokiClient:
         """
         Get list of available label names.
 
+        Defaults to a 30-day lookback when no time range is provided,
+        since Loki's label API may only return labels for recently
+        active streams without an explicit range.
+
         Args:
             start: Optional start timestamp in nanoseconds.
             end: Optional end timestamp in nanoseconds.
@@ -459,14 +461,15 @@ class LokiClient:
         Returns:
             List of label names.
         """
-        params = {}
+        if start is None and end is None:
+            start, end = self._discovery_time_range()
 
-        if start is not None:
-            params["start"] = str(start)
-        if end is not None:
-            params["end"] = str(end)
+        params = {
+            "start": str(start),
+            "end": str(end),
+        }
 
-        response = self._request("GET", "/loki/api/v1/labels", params or None)
+        response = self._request("GET", "/loki/api/v1/labels", params)
         return response.get("data", [])
 
     def get_label_values(
@@ -478,6 +481,10 @@ class LokiClient:
         """
         Get list of values for a specific label.
 
+        Defaults to a 30-day lookback when no time range is provided,
+        since Loki's label API may only return values for recently
+        active streams without an explicit range.
+
         Args:
             label: Label name to get values for.
             start: Optional start timestamp in nanoseconds.
@@ -486,12 +493,13 @@ class LokiClient:
         Returns:
             List of label values.
         """
-        params = {}
+        if start is None and end is None:
+            start, end = self._discovery_time_range()
 
-        if start is not None:
-            params["start"] = str(start)
-        if end is not None:
-            params["end"] = str(end)
+        params = {
+            "start": str(start),
+            "end": str(end),
+        }
 
         endpoint = f"/loki/api/v1/label/{label}/values"
         response = self._request("GET", endpoint, params or None)

{loki_reader_core-0.2.2 → loki_reader_core-0.2.3}/tests/test_client.py

@@ -453,16 +453,12 @@ class TestLabelDiscovery:
             mock_glv.return_value = ["myapp", "otherapp"]
             result = client._find_app_label("myapp")
             assert result == "application"
-            mock_glv.assert_called_once()
-            args = mock_glv.call_args
-            assert args.args[0] == "application"
-            assert "start" in args.kwargs
-            assert "end" in args.kwargs
+            mock_glv.assert_called_once_with("application")
 
     def test_find_app_label_job(self) -> None:
         client = LokiClient(base_url="http://localhost:3100")
         with patch.object(client, "get_label_values") as mock_glv:
-            def side_effect(label: str, start: int = None, end: int = None) -> list[str]:
+            def side_effect(label: str) -> list[str]:
                 if label == "job":
                     return ["myapp", "worker"]
                 return []
@@ -484,11 +480,7 @@ class TestLabelDiscovery:
             mock_glv.return_value = ["info", "error", "warn"]
             result = client._find_severity_label()
             assert result == "level"
-            mock_glv.assert_called_once()
-            args = mock_glv.call_args
-            assert args.args[0] == "level"
-            assert "start" in args.kwargs
-            assert "end" in args.kwargs
+            mock_glv.assert_called_once_with("level")
 
     def test_find_severity_label_none(self) -> None:
         client = LokiClient(base_url="http://localhost:3100")
@@ -506,7 +498,7 @@ class TestLabelDiscovery:
             client._find_app_label("myapp")
 
             # Only called once - second call uses cache
-            mock_glv.assert_called_once()
+            mock_glv.assert_called_once_with("application")
 
     def test_severity_label_cached(self) -> None:
         client = LokiClient(base_url="http://localhost:3100")
@@ -516,19 +508,7 @@ class TestLabelDiscovery:
             client._find_severity_label()
             client._find_severity_label()
 
-            mock_glv.assert_called_once()
-
-    def test_discovery_uses_30_day_range(self) -> None:
-        client = LokiClient(base_url="http://localhost:3100")
-        with patch.object(client, "get_label_values") as mock_glv:
-            mock_glv.return_value = ["myapp"]
-            client._find_app_label("myapp")
-
-            args = mock_glv.call_args
-            start = args.kwargs["start"]
-            end = args.kwargs["end"]
-            diff_days = (end - start) / (24 * 60 * 60 * 1_000_000_000)
-            assert diff_days == 30
+            mock_glv.assert_called_once_with("level")
 
 
 class TestMergeStreams: