Skip to content
This repository was archived by the owner on Nov 14, 2025. It is now read-only.

Commit aa5d2a5

Browse files
committed
Fixed console issue.
1 parent 0d989b0 commit aa5d2a5

4 files changed

Lines changed: 18 additions & 22 deletions

File tree

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,6 @@ parking = Entity.load(SmartDataModels.SmartCities.Parking.OffStreetParking)
186186
```
187187

188188
Once loaded we can manipulate our new parking the same way we've done until now.<br>
189-
First apply this minor fix that will prevent brokers to create the parking.
190-
```python
191-
parking.ctx.remove("iudx:SmartParking") # brokers won't resolve this context without any additional config
192-
```
193-
194189
Let's see how it is occupied.
195190

196191
```python

src/ngsildclient/api/batch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def create(self, entities: Sequence[Entity], *, batchsize: int = BATCHSIZE) -> B
110110
r = BatchResult("create")
111111
for i in range(0, len(entities), batchsize):
112112
r += self._create(entities[i : i + batchsize])
113-
self.console.message(f"Entities created : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", level=r.level)
113+
self.console.message(f"Entities created : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", lvl=r.level)
114114
return r
115115

116116
@rfc7807_error_handle
@@ -138,7 +138,7 @@ def upsert(self, entities: Sequence[Entity], *, update: bool = False, batchsize:
138138
r = BatchResult("upsert")
139139
for i in range(0, len(entities), batchsize):
140140
r += self._upsert(entities[i : i + batchsize], opt)
141-
self.console.message(f"Entities upserted : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", level=r.level)
141+
self.console.message(f"Entities upserted : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", lvl=r.level)
142142
return r
143143

144144
@rfc7807_error_handle
@@ -163,7 +163,7 @@ def update(self, entities: Sequence[Entity], *, overwrite: bool = True, batchsiz
163163
r = BatchResult("update")
164164
for i in range(0, len(entities), batchsize):
165165
r += self._update(entities[i : i + batchsize], opt)
166-
self.console.message(f"Entities updated : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", level=r.level)
166+
self.console.message(f"Entities updated : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", lvl=r.level)
167167
return r
168168

169169
@rfc7807_error_handle
@@ -184,5 +184,5 @@ def delete(self, entities: Sequence[EntityOrId], *, batchsize: int = BATCHSIZE)
184184
r = BatchResult("delete")
185185
for i in range(0, len(entities), batchsize):
186186
r += self._delete(entities[i : i + batchsize])
187-
self.console.message(f"Entities deleted : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", level=r.level)
187+
self.console.message(f"Entities deleted : {r.n_ok}/{r.n_tot} [{r.ratio:.2f}]", lvl=r.level)
188188
return r

src/ngsildclient/api/client.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ def is_connected(self, raise_for_disconnected=False) -> bool:
236236
r.raise_for_status()
237237
except Exception as e:
238238
if is_interactive():
239-
return False
239+
self.console.print(str(e))
240+
return
240241
if raise_for_disconnected:
241242
raise NgsiNotConnectedError(f"Cannot connect to Context Broker at {self.hostname}:{self.port}: {e}")
242243
else:
@@ -789,13 +790,13 @@ def _broker_version_java_spring(self) -> Optional[Tuple[Vendor, str]]:
789790
return None
790791

791792
def _welcome_message(self) -> str:
792-
return f"[green]Connected[/] to Context Broker at [blue]{self.hostname}:{self.port}[/] | vendor=[blue]{self.broker.vendor.value}[/] | version=[blue]{self.broker.version}[/]"
793+
return f"[green]Connected[/] to Context Broker at [blue3]{self.hostname}:{self.port}[/] | vendor=[blue3]{self.broker.vendor.value}[/] | version=[blue3]{self.broker.version}[/]"
793794

794795
def _fail_message(self) -> str:
795-
return f"[red]Failed[/] to connect to Context Broker at {self.hostname}:{self.port}"
796+
return f"[red3]Failed[/] to connect to Context Broker at [blue3]{self.hostname}:{self.port}[/]"
796797

797798
def _warn_spring_message(self) -> str:
798-
return "Java-Spring based Context Broker detected. [orange]Info endpoint disabled."
799+
return "Java-Spring based Context Broker detected. [orange3]Info endpoint disabled."
799800

800801
def _create_network(self, root: Entity, G: nx.Graph, nodecache: dict, edgecache: Set):
801802
source: Tuple = Urn.split(root.id)

src/ngsildclient/utils/console.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ def __init__(self, verbose=True):
3131
self.console = console.Console() if is_interactive() else None
3232
self.verbose = verbose
3333

34-
def message(self, msg: str, *, color: str = None, level: MsgLvl = "info"):
34+
def message(self, msg: str, *, color: str = None, lvl: MsgLvl = "info"):
3535
if not self.verbose:
3636
return
3737
if not self.console:
3838
print(msg)
3939
return
4040
text = Text(msg)
41-
if level:
42-
color = MAP_LEVEL_COLOR.get(level, None)
41+
if lvl:
42+
color = MAP_LEVEL_COLOR.get(lvl, None)
4343
if color:
4444
text.stylize(color)
4545
self.console.print(text)
4646

47-
def success(self):
48-
self.message(color="green")
47+
def success(self, msg: str):
48+
self.message(msg, lvl="success")
4949

50-
def warn(self):
51-
self.message(color="orange")
50+
def warn(self, msg: str):
51+
self.message(msg, lvl="warning")
5252

53-
def error(self):
54-
self.message(color="red")
53+
def error(self, msg: str):
54+
self.message(msg, lvl="error")
5555

5656
def print(self, msg: str):
5757
if not self.verbose:

0 commit comments

Comments
 (0)