Fixed some linter errors

Author: fbattello

poetry.lock

@@ -34,19 +34,11 @@ flake8-black = "^0.3.3"
 Sphinx = "^4.2.0"
 sphinx-autodoc-typehints = "^1.12.0"
 sphinx-rtd-theme = "^1.0.0"
-flakehell = "^0.9.0"
 pytest-httpx = "^0.21.0"
 pytest-asyncio = "^0.19.0"
 ipykernel = "^6.15.2"
 pydata-sphinx-theme = "0.9.0"
 
-[tool.flakehell]
-exclude = ["README.md"]
-format = "colored"
-max_line_length = 90
-extended_default_ignore = []
-show_source = true
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -37,7 +37,7 @@ def __init__(self, client: Client):
     def count(self, query: Union[dict, Path], ctx: str = None) -> int:
         if isinstance(query, Path):
             with open(query) as f:
-                query = json.load(f)           
+                query = json.load(f)
         return self._client.entities._count_alt(query, ctx)
 
     def query_head(self, query: Union[dict, Path], ctx: str = None, n: int = 5) -> List[Entity]:
@@ -68,7 +68,7 @@ def query_head(self, query: Union[dict, Path], ctx: str = None, n: int = 5) -> L
         """
         if isinstance(query, Path):
             with open(query) as f:
-                query = json.load(f)          
+                query = json.load(f)
         return self._client.entities._query_alt(query, ctx, limit=n)
 
     def query(
@@ -105,7 +105,7 @@ def query(
         """
         if isinstance(query, Path):
             with open(query) as f:
-                query = json.load(f)          
+                query = json.load(f)
         entities: list[Entity] = []
         count = self.count(query, ctx=ctx)
         if count > max:
@@ -141,7 +141,7 @@ def query_generator(
         """
         if isinstance(query, Path):
             with open(query) as f:
-                query = json.load(f)           
+                query = json.load(f)
         count = self.count(query)
         for page in range(ceil(count / limit)):
             if batch:

src/ngsildclient/api/alt.py

@@ -26,21 +26,18 @@
 
 logger = logging.getLogger(__name__)
 
+
 class Batch:
-    """A wrapper for the NGSI-LD API batch endpoint."""    
+    """A wrapper for the NGSI-LD API batch endpoint."""
 
     def __init__(self, client: AsyncClient, url: str):
         self._client = client
         self._session = client.client
         self.url = url
 
     @rfc7807_error_handle_async
-    async def _create(
-        self, entities: Sequence[Entity]) -> BatchResult:
-        r = await self._session.post(
-            f"{self.url}/create/", 
-            content=json.dumps([e for e in entities], cls=NgsiEncoder)
-        )
+    async def _create(self, entities: Sequence[Entity]) -> BatchResult:
+        r = await self._session.post(f"{self.url}/create/", content=json.dumps([e for e in entities], cls=NgsiEncoder))
         self._client.raise_for_status(r)
         if r.status_code == 201:
             success, errors = r.json(), []
@@ -55,16 +52,14 @@ async def _create(
     async def create(self, entities: Sequence[Entity], batchsize: int = BATCHSIZE) -> BatchResult:
         r = BatchResult("create")
         for i in range(0, len(entities), batchsize):
-            r += await self._create(entities[i:i+batchsize])
+            r += await self._create(entities[i : i + batchsize])
         return r
-    
+
     @rfc7807_error_handle_async
     async def _upsert(self, entities: Sequence[Entity], opt: Literal["replace", "update"] = "replace") -> BatchResult:
         params = {"options": opt} if opt else {}
         r = await self._session.post(
-            f"{self.url}/upsert/",
-            content=json.dumps([e for e in entities], cls=NgsiEncoder),
-            params=params
+            f"{self.url}/upsert/", content=json.dumps([e for e in entities], cls=NgsiEncoder), params=params
         )
         self._client.raise_for_status(r)
         if r.status_code == 201:
@@ -79,21 +74,21 @@ async def _upsert(self, entities: Sequence[Entity], opt: Literal["replace", "upd
         return BatchResult("upsert", success, errors)
 
     @rfc7807_error_handle_async
-    async def upsert(self, entities: Sequence[Entity], *, update: bool = False, batchsize: int = BATCHSIZE) -> BatchResult:
+    async def upsert(
+        self, entities: Sequence[Entity], *, update: bool = False, batchsize: int = BATCHSIZE
+    ) -> BatchResult:
         # default mode (without any option) is "replace", anyway always force the option
-        opt = "update" if update else "replace"        
+        opt = "update" if update else "replace"
         r = BatchResult("upsert")
         for i in range(0, len(entities), batchsize):
-            r += await self._upsert(entities[i:i+batchsize], opt) 
+            r += await self._upsert(entities[i : i + batchsize], opt)
         return r
 
     @rfc7807_error_handle_async
     async def _update(self, entities: Sequence[Entity], opt: Literal["noOverwrite"] = None) -> BatchResult:
         params = {"options": opt} if opt else {}
         r = await self._session.post(
-            f"{self.url}/update/", 
-            content=json.dumps([e for e in entities], cls=NgsiEncoder),
-            params=params
+            f"{self.url}/update/", content=json.dumps([e for e in entities], cls=NgsiEncoder), params=params
         )
         self._client.raise_for_status(r)
         if r.status_code == 204:
@@ -106,11 +101,13 @@ async def _update(self, entities: Sequence[Entity], opt: Literal["noOverwrite"]
         return BatchResult("update", success, errors)
 
     @rfc7807_error_handle_async
-    async def update(self, entities: Sequence[Entity], *, overwrite: bool = True, batchsize: int = BATCHSIZE) -> BatchResult:
+    async def update(
+        self, entities: Sequence[Entity], *, overwrite: bool = True, batchsize: int = BATCHSIZE
+    ) -> BatchResult:
         opt = "noOverwrite" if not overwrite else None
         r = BatchResult("update")
         for i in range(0, len(entities), batchsize):
-            r += await self._update(entities[i:i+batchsize], opt) 
+            r += await self._update(entities[i : i + batchsize], opt)
         return r
 
     @rfc7807_error_handle_async
@@ -132,5 +129,5 @@ async def _delete(self, entities: Sequence[EntityOrId]) -> BatchResult:
     async def delete(self, entities: Sequence[EntityOrId], batchsize: int = BATCHSIZE) -> BatchResult:
         r = BatchResult("delete")
         for i in range(0, len(entities), batchsize):
-            r += await self._delete(entities[i:i+batchsize]) 
+            r += await self._delete(entities[i : i + batchsize])
         return r

src/ngsildclient/api/asyn/batch.py

@@ -14,13 +14,23 @@
 import logging
 import httpx
 from httpx._types import AuthTypes
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Optional, Generator, List, Union, Callable
+from typing import TYPE_CHECKING, Generator, List, Union, Callable
 from math import ceil
 
 from ...model.entity import Entity
-from ..constants import *
-from ..exceptions import *
+from ..constants import (
+    NGSILD_DEFAULT_PORT,
+    NGSILD_TEMPORAL_PORT,
+    UA,
+    NGSILD_PATH,
+    ENDPOINT_ENTITIES,
+    ENDPOINT_BATCH,
+    ENDPOINT_TYPES,
+    ENDPOINT_CONTEXTS,
+    ENDPOINT_SUBSCRIPTIONS,
+    NGSILD_BASEPATH,
+    PAGINATION_LIMIT_MAX,
+)
 from .entities import Entities
 from .batch import Batch, BatchResult
 from .types import Types
@@ -201,15 +211,15 @@ async def create(self, *entities) -> Union[bool, BatchResult]:
 
         Parameters
         ----------
-        entities : 
+        entities :
             Entities to be created by the Context Broker
             Either a single Entity, or a list of entities, or comma-separated entities
 
         Returns
         -------
         Entity
             The entities successfully upserted
-        """        
+        """
         if len(entities) == 1:
             if isinstance(entities[0], Entity):
                 entity = entities[0]
@@ -236,7 +246,7 @@ async def get(
             The entity identifier or the entity instance
         ctx : str
             The context
-        asdict : bool, optional
+        asdict : bool
             If set (instead of returning an Entity) returns the raw API response (a Python dict that represents the JSON response), by default False
 
         Returns
@@ -253,23 +263,22 @@ async def delete(self, *entities) -> Union[bool, BatchResult]:
 
         Parameters
         ----------
-        entities : 
+        entities :
             Entities to be deleted by the Context Broker
             Either a single Entity, or a list of entities, or comma-separated entities
 
         Returns
         -------
         Entity
             The entities successfully upserted
-        """        
+        """
         if len(entities) == 1:
             if isinstance(entities[0], Entity):
                 entity = entities[0]
                 return await self.entities.delete(entity)
             else:
                 entities = entities[0]
         return await self.batch.delete(entities)
-            
 
     async def delete_from_file(self, filename: str) -> Union[bool, dict]:
         """Delete in the broker all entities present in the JSON file.
@@ -307,20 +316,20 @@ async def upsert(self, *entities, update: bool = False) -> Union[bool, BatchResu
 
         Parameters
         ----------
-        entities : 
+        entities :
             Entities to be upserted by the Context Broker
             Either a single Entity, or a list of entities, or comma-separated entities
 
         update: bool
             For batch mode only.
             If set : "indicates that existing Entity content shall be updated".
-            If not set : "indicates that all the existing Entity content shall be replaced (default mode)".            
+            If not set : "indicates that all the existing Entity content shall be replaced (default mode)".
 
         Returns
         -------
         Entity
             The entities successfully upserted
-        """        
+        """
         if len(entities) == 1:
             if isinstance(entities[0], Entity):
                 entity = entities[0]
@@ -347,20 +356,20 @@ async def update(self, *entities, overwrite=True) -> Union[bool, BatchResult]:
 
         Parameters
         ----------
-        entities : 
+        entities :
             Entities to be upserted by the Context Broker
             Either a single Entity, or a list of entities, or comma-separated entities
 
         overwrite: bool
             For batch mode only.
             If set : Overwrite (default mode).
-            If unset switch to "noOverwrite" mode : "indicates that no attribute overwrite shall be performed".            
+            If unset switch to "noOverwrite" mode : "indicates that no attribute overwrite shall be performed".
 
         Returns
         -------
         Entity
             The entities successfully updated
-        """        
+        """
         if len(entities) == 1:
             if isinstance(entities[0], Entity):
                 entity = entities[0]

src/ngsildclient/api/asyn/client.py

@@ -10,7 +10,7 @@
 # Author: Fabien BATTELLO <fabien.battello@orange.com> et al.
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, Union, Optional, List
+from typing import TYPE_CHECKING, Union, List
 from httpx import Response
 import logging
 
@@ -21,7 +21,7 @@
 from ..constants import JSONLD_CONTEXT, ENDPOINT_ENTITIES
 from ...model.entity import Entity
 
-from ..exceptions import rfc7807_error_handle_async, NgsiApiError, NgsiAlreadyExistsError
+from ..exceptions import rfc7807_error_handle_async, NgsiAlreadyExistsError
 
 logger = logging.getLogger(__name__)
 
@@ -38,14 +38,13 @@ def to_broker_url(self, eid: Union[str, Entity]) -> str:
     @rfc7807_error_handle_async
     async def create(self, entity: Entity, skip: bool = False, overwrite: bool = False) -> bool:
         headers = {"Content-Type": "application/ld+json"}
-        r: Response = await self._client.client.post(url=f"{self.url}/", headers=headers, 
-            content=entity.to_json())
+        r: Response = await self._client.client.post(url=f"{self.url}/", headers=headers, content=entity.to_json())
         if r.status_code == 409:  # already exists
             if skip:
                 return False
             elif overwrite or self._client.overwrite:
                 return self.update(entity, check_exists=False)
-        if not self._client.ignore_errors:    
+        if not self._client.ignore_errors:
             self._client.raise_for_status(r)
         return True
 
@@ -105,7 +104,7 @@ async def _query(
         self,
         type: str = None,
         q: str = None,
-        gq: str = None,        
+        gq: str = None,
         ctx: str = None,
         limit: int = 0,
         offset: int = 0,
@@ -123,7 +122,7 @@ async def _query(
         if q:
             params["q"] = q
         if gq:
-            params["geoQ"] = gq            
+            params["geoQ"] = gq
         headers = {
             "Accept": "application/ld+json",
         }  # overrides session headers

src/ngsildclient/api/asyn/entities.py

@@ -49,9 +49,7 @@ async def create(self, subscr: dict, raise_on_conflict: bool = True) -> bool:
         id_returned_from_broker = location.rsplit("/", 1)[-1]
         id = subscr.get("id")
         if id is not None and id != id_returned_from_broker:
-            raise NgsiApiError(
-                f"Broker returned wrong id. Expected={id} Returned={id_returned_from_broker}"
-            )
+            raise NgsiApiError(f"Broker returned wrong id. Expected={id} Returned={id_returned_from_broker}")
         return id_returned_from_broker
 
     @rfc7807_error_handle_async
@@ -61,18 +59,14 @@ async def list(self, pattern: str = None, ctx: str = CORE_CONTEXT) -> Optional[d
             # "Content-Type": None,
         }  # overrides session headers
         if ctx is not None:
-            headers[
-                "Link"
-            ] = f'<{ctx}>; rel="{CORE_CONTEXT}"; type="application/ld+json"'
+            headers["Link"] = f'<{ctx}>; rel="{CORE_CONTEXT}"; type="application/ld+json"'
         r = await self._session.get(f"{self.url}")
         subscriptions = r.json()
         if pattern is not None:
             subscriptions = [
                 x
                 for x in subscriptions
-                if re.search(
-                    pattern, x.get("name", "") + x.get("description", ""), re.IGNORECASE
-                )
+                if re.search(pattern, x.get("name", "") + x.get("description", ""), re.IGNORECASE)
             ]
         return subscriptions
 
@@ -98,9 +92,7 @@ async def conflicts(self, subscr: dict, ctx: str = CORE_CONTEXT) -> list:
             # "Content-Type": None,
         }  # overrides session headers
         if ctx is not None:
-            headers[
-                "Link"
-            ] = f'<{ctx}>; rel="{CORE_CONTEXT}"; type="application/ld+json"'
+            headers["Link"] = f'<{ctx}>; rel="{CORE_CONTEXT}"; type="application/ld+json"'
         r = await self._session.get(f"{self.url}")
         return [x for x in r.json() if Subscriptions._hash(x) == hashref]
 
@@ -111,9 +103,7 @@ async def get(self, id: str, ctx: str = CORE_CONTEXT) -> dict:
             # "Content-Type": None,
         }  # overrides session headers
         if ctx is not None:
-            headers[
-                "Link"
-            ] = f'<{ctx}>; rel="{CORE_CONTEXT}"; type="application/ld+json"'
+            headers["Link"] = f'<{ctx}>; rel="{CORE_CONTEXT}"; type="application/ld+json"'
         r = await self._session.get(f"{self.url}/{id}", headers=headers)
         self._client.raise_for_status(r)
         return r.json()

src/ngsildclient/api/asyn/subscriptions.py

@@ -11,7 +11,6 @@
 
 from __future__ import annotations
 from typing import TYPE_CHECKING, Union, List, Sequence, Generator, Callable, Awaitable
-from dataclasses import dataclass
 from datetime import timedelta
 from isodate import duration_isoformat
 from httpx import Response