brreg-wrapper 0.2.0__tar.gz → 0.2.3__tar.gz

{brreg_wrapper-0.2.0/src/brreg_wrapper.egg-info → brreg_wrapper-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brreg-wrapper
-Version: 0.2.0
+Version: 0.2.3
 Summary: A Python wrapper for the Brønnøysund Register Centre (Brreg) API.
 Author-email: Sondre Dyrnes <sondre@villdyr.no>
 License-Expression: MIT
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx<1.0,>=0.27
 Requires-Dist: pydantic<3.0,>=2.0
-Requires-Dist: tenacity<9.0,>=8.2
+Requires-Dist: tenacity<10.0,>=8.2
 Provides-Extra: dev
 Requires-Dist: pytest<9.0,>=8.0; extra == "dev"
 Requires-Dist: pytest-asyncio<1.0,>=0.23; extra == "dev"

{brreg_wrapper-0.2.0 → brreg_wrapper-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brreg-wrapper"
-version = "0.2.0"
+version = "0.2.3"
 description = "A Python wrapper for the Brønnøysund Register Centre (Brreg) API."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -21,7 +21,7 @@ classifiers = [
 dependencies = [
     "httpx>=0.27,<1.0",
     "pydantic>=2.0,<3.0", 
-    "tenacity>=8.2,<9.0", # Added for retry logic
+    "tenacity>=8.2,<10.0",
 ]
 
 [project.urls]

{brreg_wrapper-0.2.0 → brreg_wrapper-0.2.3}/src/brreg_wrapper/client.py

@@ -196,6 +196,22 @@ class BrregClient:
                 request_params=request_params,
             )
 
+    def _log_mapped_http_error(self, exc: httpx.HTTPStatusError) -> None:
+        """Log a mapped HTTP error at a level matching its severity.
+
+        404 is an expected miss (callers often try enhet, then underenhet),
+        so it is logged at DEBUG without exception info. Other HTTP errors
+        stay at ERROR with traceback.
+        """
+        message = (
+            f"HTTP error {exc.response.status_code} for {exc.request.url}: "
+            f"{exc.response.text}"
+        )
+        if exc.response.status_code == 404:
+            self._logger.debug(message)
+        else:
+            self._logger.error(message, exc_info=True)
+
     async def _request(
         self,
         method: str,
@@ -251,11 +267,7 @@ class BrregClient:
                 return response
             except httpx.HTTPStatusError as exc:
                 error = self._map_http_error(exc)
-                self._logger.error(
-                    f"HTTP error {exc.response.status_code} for {exc.request.url}: "
-                    f"{exc.response.text}",
-                    exc_info=True,
-                )
+                self._log_mapped_http_error(exc)
                 raise error
             except httpx.TimeoutException as exc:
                 self._logger.error(f"Request timed out: {exc}", exc_info=True)
@@ -332,11 +344,7 @@ class BrregClient:
                 return response
             except httpx.HTTPStatusError as exc:
                 error = self._map_http_error(exc)
-                self._logger.error(
-                    f"HTTP error {exc.response.status_code} for {exc.request.url}: "
-                    f"{exc.response.text}",
-                    exc_info=True,
-                )
+                self._log_mapped_http_error(exc)
                 raise error
             except httpx.TimeoutException as exc:
                 self._logger.error(f"Request timed out: {exc}", exc_info=True)

{brreg_wrapper-0.2.0 → brreg_wrapper-0.2.3}/src/brreg_wrapper/models/__init__.py

@@ -162,6 +162,23 @@ class LegacyPaategning(BaseModel):
     )
 
 
+class HistoriskNavn(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    navn: str = Field(..., description="Historisk navn")
+    fraDato: str = Field(
+        ...,
+        description="Dato navnet ble gyldig fra",
+        examples=["1995-02-22 22:56:00"],
+    )
+    tilDato: str = Field(
+        ...,
+        description="Dato navnet var gyldig til",
+        examples=["1996-05-22 19:00:08"],
+    )
+
+
 class Self1(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
@@ -572,6 +589,9 @@ class Enhet(BaseModel):
     mobil: Optional[str] = Field(
         None, description="Enhetens mobilnummer", examples=["91504800"]
     )
+    historiskeNavn: Optional[Sequence[HistoriskNavn]] = Field(
+        None, description="Enhetens historiske navn"
+    )
     field_links: Optional[FieldLinks2] = Field(None, alias="_links")
 
 
@@ -1243,6 +1263,9 @@ class Underenhet(BaseModel):
     mobil: Optional[str] = Field(
         None, description="Underenhetens mobilnummer", examples=["91504800"]
     )
+    historiskeNavn: Optional[Sequence[HistoriskNavn]] = Field(
+        None, description="Underenhetens historiske navn"
+    )
     field_links: Optional[FieldLinks13] = Field(None, alias="_links")
 
 

{brreg_wrapper-0.2.0 → brreg_wrapper-0.2.3/src/brreg_wrapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brreg-wrapper
-Version: 0.2.0
+Version: 0.2.3
 Summary: A Python wrapper for the Brønnøysund Register Centre (Brreg) API.
 Author-email: Sondre Dyrnes <sondre@villdyr.no>
 License-Expression: MIT
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx<1.0,>=0.27
 Requires-Dist: pydantic<3.0,>=2.0
-Requires-Dist: tenacity<9.0,>=8.2
+Requires-Dist: tenacity<10.0,>=8.2
 Provides-Extra: dev
 Requires-Dist: pytest<9.0,>=8.0; extra == "dev"
 Requires-Dist: pytest-asyncio<1.0,>=0.23; extra == "dev"

{brreg_wrapper-0.2.0 → brreg_wrapper-0.2.3}/src/brreg_wrapper.egg-info/requires.txt

@@ -1,6 +1,6 @@
 httpx<1.0,>=0.27
 pydantic<3.0,>=2.0
-tenacity<9.0,>=8.2
+tenacity<10.0,>=8.2
 
 [all]
 h2<5.0,>=4.0

{brreg_wrapper-0.2.0 → brreg_wrapper-0.2.3}/tests/test_client.py

@@ -24,6 +24,7 @@ from brreg_wrapper.models import (
     Kommuner1,  # Added import
     Page,
     SlettetEnhet,
+    Underenhet,
 )
 
 
@@ -289,7 +290,9 @@ async def test_async_context_manager():
 
 
 @pytest.mark.asyncio
-async def test_get_enhet_not_found(httpx_mock: HTTPXMock):
+async def test_get_enhet_not_found(
+    httpx_mock: HTTPXMock, caplog: pytest.LogCaptureFixture
+):
     """Test handling of a 404 Not Found error when retrieving an entity."""
     org_nr = "123456789"
     expected_url = f"{BrregClient.BASE_URL}/enheter/{org_nr}"
@@ -303,10 +306,16 @@ async def test_get_enhet_not_found(httpx_mock: HTTPXMock):
 
     client = BrregClient()
     try:
-        with pytest.raises(httpx.HTTPStatusError) as exc_info:
-            await client.get_enhet(org_nr)
+        with caplog.at_level("DEBUG", logger="brreg_wrapper.client"):
+            with pytest.raises(BrregResourceNotFoundError) as exc_info:
+                await client.get_enhet(org_nr)
 
-        assert exc_info.value.response.status_code == 404
+        assert exc_info.value.status_code == 404
+        assert not any(record.levelname == "ERROR" for record in caplog.records)
+        assert any(
+            record.levelname == "DEBUG" and "HTTP error 404" in record.message
+            for record in caplog.records
+        )
 
         # Verify the request was made
         request = httpx_mock.get_request()
@@ -316,6 +325,36 @@ async def test_get_enhet_not_found(httpx_mock: HTTPXMock):
         await client.close()
 
 
+@pytest.mark.asyncio
+async def test_get_enhet_server_error_logs_at_error(
+    httpx_mock: HTTPXMock, caplog: pytest.LogCaptureFixture
+):
+    """5xx responses should still be logged at ERROR with exception info."""
+    org_nr = "123456789"
+    expected_url = f"{BrregClient.BASE_URL}/enheter/{org_nr}"
+
+    httpx_mock.add_response(
+        url=expected_url,
+        method="GET",
+        status_code=500,
+        json={"message": "Internal Server Error"},
+    )
+
+    client = BrregClient(max_retries=0)
+    try:
+        with caplog.at_level("DEBUG", logger="brreg_wrapper.client"):
+            with pytest.raises(BrregServerError) as exc_info:
+                await client.get_enhet(org_nr)
+
+        assert exc_info.value.status_code == 500
+        error_records = [r for r in caplog.records if r.levelname == "ERROR"]
+        assert error_records
+        assert any("HTTP error 500" in record.message for record in error_records)
+        assert any(record.exc_info is not None for record in error_records)
+    finally:
+        await client.close()
+
+
 @pytest.mark.asyncio
 async def test_get_enhet_deleted(httpx_mock: HTTPXMock):
     """Test retrieving a deleted entity."""
@@ -683,3 +722,50 @@ async def test_response_json_property():
     # Test with no response text
     error = BrregAPIError(message="Test error", status_code=400)
     assert error.response_json is None
+
+
+@pytest.mark.asyncio
+async def test_get_underenhet_with_historiske_navn(httpx_mock: HTTPXMock):
+    """Underenhet responses may include historiskeNavn from the live API."""
+    org_nr = "971917407"
+    mock_response_data = {
+        "organisasjonsnummer": org_nr,
+        "navn": "BETONMAST INNLANDET AS",
+        "organisasjonsform": {
+            "kode": "BEDR",
+            "beskrivelse": "Underenhet til næringsdrivende og offentlig forvaltning",
+            "_links": {
+                "self": {"href": f"{BrregClient.BASE_URL}/organisasjonsformer/BEDR"}
+            },
+        },
+        "historiskeNavn": [
+            {
+                "navn": "TOTEN BYGG OG ANLEGG AS",
+                "fraDato": "1996-05-22 19:00:08",
+                "tilDato": "2003-01-27 20:36:38",
+            }
+        ],
+        "registrertIMvaregisteret": False,
+        "registreringsdatoEnhetsregisteret": "1995-02-22",
+        "harRegistrertAntallAnsatte": True,
+        "_links": {"self": {"href": f"{BrregClient.BASE_URL}/underenheter/{org_nr}"}},
+    }
+    expected_url = f"{BrregClient.BASE_URL}/underenheter/{org_nr}"
+
+    httpx_mock.add_response(
+        url=expected_url,
+        method="GET",
+        json=mock_response_data,
+        status_code=200,
+        headers={"Content-Type": "application/json"},
+    )
+
+    client = BrregClient()
+    try:
+        underenhet = await client.get_underenhet(org_nr)
+        assert isinstance(underenhet, Underenhet)
+        assert underenhet.navn == "BETONMAST INNLANDET AS"
+        assert underenhet.historiskeNavn is not None
+        assert underenhet.historiskeNavn[0].navn == "TOTEN BYGG OG ANLEGG AS"
+    finally:
+        await client.close()