SolarManager unter Versionsverwaltung
Erster Stand der Hintergrundprozesse, die auf der Synology unter /volume1/homes/wagner/SolarManager laufen: der Manager selbst, die Sammler je Geraet, die MQTT-Bruecke, der Wecker und - neu hinzugezogen - der AutoAction-Runner, der als Hintergrundprozess hierher gehoert und nicht ins Web-Verzeichnis. Zugangsdaten stehen nicht mehr im Quelltext, sondern in config.ini, die nicht mit eingecheckt wird. Vorlage ist config.ini.example, gelesen wird sie von konfig.py. Betroffen waren solarManager.py (Datenbank und Wattpilot), zeit.py, gatherWaterData.py, wecker.py und skoda_testdaten.py, das sich das Passwort bisher aus dem Quelltext eines anderen Moduls herausgesucht hat. Die Kia-Anbindung ist mit dem Fahrzeug entfallen: kiaTest.py, gatherCarData.py und hyundai_kia_connect_api sind nicht mehr dabei, ebenso gatherInverterData.py, auf das nur noch eine auskommentierte Zeile zeigte. Die mitgelieferten Bibliotheken bleiben im Repository - die NAS hat kein pip, sie muessen neben den Skripten liegen. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
@@ -0,0 +1,144 @@
|
||||
# Copyright The OpenTelemetry Authors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import datetime
|
||||
import threading
|
||||
|
||||
from collections import OrderedDict, deque
|
||||
from collections.abc import MutableMapping, Sequence
|
||||
from typing import Optional
|
||||
|
||||
from deprecated import deprecated
|
||||
|
||||
|
||||
def ns_to_iso_str(nanoseconds):
|
||||
"""Get an ISO 8601 string from time_ns value."""
|
||||
ts = datetime.datetime.utcfromtimestamp(nanoseconds / 1e9)
|
||||
return ts.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
|
||||
|
||||
|
||||
def get_dict_as_key(labels):
|
||||
"""Converts a dict to be used as a unique key"""
|
||||
return tuple(
|
||||
sorted(
|
||||
map(
|
||||
lambda kv: (kv[0], tuple(kv[1])) if isinstance(kv[1], list) else kv,
|
||||
labels.items(),
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
class BoundedList(Sequence):
|
||||
"""An append only list with a fixed max size.
|
||||
|
||||
Calls to `append` and `extend` will drop the oldest elements if there is
|
||||
not enough room.
|
||||
"""
|
||||
|
||||
def __init__(self, maxlen: Optional[int]):
|
||||
self.dropped = 0
|
||||
self._dq = deque(maxlen=maxlen) # type: deque
|
||||
self._lock = threading.Lock()
|
||||
|
||||
def __repr__(self):
|
||||
return f"{type(self).__name__}({list(self._dq)}, maxlen={self._dq.maxlen})"
|
||||
|
||||
def __getitem__(self, index):
|
||||
return self._dq[index]
|
||||
|
||||
def __len__(self):
|
||||
return len(self._dq)
|
||||
|
||||
def __iter__(self):
|
||||
with self._lock:
|
||||
return iter(deque(self._dq))
|
||||
|
||||
def append(self, item):
|
||||
with self._lock:
|
||||
if self._dq.maxlen is not None and len(self._dq) == self._dq.maxlen:
|
||||
self.dropped += 1
|
||||
self._dq.append(item)
|
||||
|
||||
def extend(self, seq):
|
||||
with self._lock:
|
||||
if self._dq.maxlen is not None:
|
||||
to_drop = len(seq) + len(self._dq) - self._dq.maxlen
|
||||
if to_drop > 0:
|
||||
self.dropped += to_drop
|
||||
self._dq.extend(seq)
|
||||
|
||||
@classmethod
|
||||
def from_seq(cls, maxlen, seq):
|
||||
seq = tuple(seq)
|
||||
bounded_list = cls(maxlen)
|
||||
bounded_list.extend(seq)
|
||||
return bounded_list
|
||||
|
||||
|
||||
@deprecated(version="1.4.0") # type: ignore
|
||||
class BoundedDict(MutableMapping):
|
||||
"""An ordered dict with a fixed max capacity.
|
||||
|
||||
Oldest elements are dropped when the dict is full and a new element is
|
||||
added.
|
||||
"""
|
||||
|
||||
def __init__(self, maxlen: Optional[int]):
|
||||
if maxlen is not None:
|
||||
if not isinstance(maxlen, int):
|
||||
raise ValueError
|
||||
if maxlen < 0:
|
||||
raise ValueError
|
||||
self.maxlen = maxlen
|
||||
self.dropped = 0
|
||||
self._dict = OrderedDict() # type: OrderedDict
|
||||
self._lock = threading.Lock() # type: threading.Lock
|
||||
|
||||
def __repr__(self):
|
||||
return f"{type(self).__name__}({dict(self._dict)}, maxlen={self.maxlen})"
|
||||
|
||||
def __getitem__(self, key):
|
||||
return self._dict[key]
|
||||
|
||||
def __setitem__(self, key, value):
|
||||
with self._lock:
|
||||
if self.maxlen is not None and self.maxlen == 0:
|
||||
self.dropped += 1
|
||||
return
|
||||
|
||||
if key in self._dict:
|
||||
del self._dict[key]
|
||||
elif self.maxlen is not None and len(self._dict) == self.maxlen:
|
||||
del self._dict[next(iter(self._dict.keys()))]
|
||||
self.dropped += 1
|
||||
self._dict[key] = value
|
||||
|
||||
def __delitem__(self, key):
|
||||
del self._dict[key]
|
||||
|
||||
def __iter__(self):
|
||||
with self._lock:
|
||||
return iter(self._dict.copy())
|
||||
|
||||
def __len__(self):
|
||||
return len(self._dict)
|
||||
|
||||
@classmethod
|
||||
def from_map(cls, maxlen, mapping):
|
||||
mapping = OrderedDict(mapping)
|
||||
bounded_dict = cls(maxlen)
|
||||
for key, value in mapping.items():
|
||||
bounded_dict[key] = value
|
||||
return bounded_dict
|
||||
@@ -0,0 +1,147 @@
|
||||
# Copyright The OpenTelemetry Authors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
from json import dumps
|
||||
from typing import Optional
|
||||
|
||||
from deprecated import deprecated
|
||||
|
||||
|
||||
class InstrumentationInfo:
|
||||
"""Immutable information about an instrumentation library module.
|
||||
|
||||
See `opentelemetry.trace.TracerProvider.get_tracer` for the meaning of these
|
||||
properties.
|
||||
"""
|
||||
|
||||
__slots__ = ("_name", "_version", "_schema_url")
|
||||
|
||||
@deprecated(version="1.11.1", reason="You should use InstrumentationScope")
|
||||
def __init__(
|
||||
self,
|
||||
name: str,
|
||||
version: Optional[str] = None,
|
||||
schema_url: Optional[str] = None,
|
||||
):
|
||||
self._name = name
|
||||
self._version = version
|
||||
if schema_url is None:
|
||||
schema_url = ""
|
||||
self._schema_url = schema_url
|
||||
|
||||
def __repr__(self):
|
||||
return (
|
||||
f"{type(self).__name__}({self._name}, {self._version}, {self._schema_url})"
|
||||
)
|
||||
|
||||
def __hash__(self):
|
||||
return hash((self._name, self._version, self._schema_url))
|
||||
|
||||
def __eq__(self, value):
|
||||
return type(value) is type(self) and (
|
||||
self._name,
|
||||
self._version,
|
||||
self._schema_url,
|
||||
) == (value._name, value._version, value._schema_url)
|
||||
|
||||
def __lt__(self, value):
|
||||
if type(value) is not type(self):
|
||||
return NotImplemented
|
||||
return (self._name, self._version, self._schema_url) < (
|
||||
value._name,
|
||||
value._version,
|
||||
value._schema_url,
|
||||
)
|
||||
|
||||
@property
|
||||
def schema_url(self) -> Optional[str]:
|
||||
return self._schema_url
|
||||
|
||||
@property
|
||||
def version(self) -> Optional[str]:
|
||||
return self._version
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
return self._name
|
||||
|
||||
|
||||
class InstrumentationScope:
|
||||
"""A logical unit of the application code with which the emitted telemetry can be
|
||||
associated.
|
||||
|
||||
See `opentelemetry.trace.TracerProvider.get_tracer` for the meaning of these
|
||||
properties.
|
||||
"""
|
||||
|
||||
__slots__ = ("_name", "_version", "_schema_url")
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
name: str,
|
||||
version: Optional[str] = None,
|
||||
schema_url: Optional[str] = None,
|
||||
) -> None:
|
||||
self._name = name
|
||||
self._version = version
|
||||
if schema_url is None:
|
||||
schema_url = ""
|
||||
self._schema_url = schema_url
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return (
|
||||
f"{type(self).__name__}({self._name}, {self._version}, {self._schema_url})"
|
||||
)
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash((self._name, self._version, self._schema_url))
|
||||
|
||||
def __eq__(self, value: object) -> bool:
|
||||
if not isinstance(value, InstrumentationScope):
|
||||
return NotImplemented
|
||||
return (self._name, self._version, self._schema_url) == (
|
||||
value._name,
|
||||
value._version,
|
||||
value._schema_url,
|
||||
)
|
||||
|
||||
def __lt__(self, value: object) -> bool:
|
||||
if not isinstance(value, InstrumentationScope):
|
||||
return NotImplemented
|
||||
return (self._name, self._version, self._schema_url) < (
|
||||
value._name,
|
||||
value._version,
|
||||
value._schema_url,
|
||||
)
|
||||
|
||||
@property
|
||||
def schema_url(self) -> Optional[str]:
|
||||
return self._schema_url
|
||||
|
||||
@property
|
||||
def version(self) -> Optional[str]:
|
||||
return self._version
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
return self._name
|
||||
|
||||
def to_json(self, indent=4) -> str:
|
||||
return dumps(
|
||||
{
|
||||
"name": self._name,
|
||||
"version": self._version,
|
||||
"schema_url": self._schema_url,
|
||||
},
|
||||
indent=indent,
|
||||
)
|
||||
Reference in New Issue
Block a user