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:
@@ -0,0 +1,99 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import warnings
|
||||
from typing import Any, Dict, Iterable, Optional
|
||||
|
||||
|
||||
__all__ = ["lazy_import"]
|
||||
|
||||
|
||||
def import_name(name: str, source: str, namespace: Dict[str, Any]) -> Any:
|
||||
"""
|
||||
Import ``name`` from ``source`` in ``namespace``.
|
||||
|
||||
There are two use cases:
|
||||
|
||||
- ``name`` is an object defined in ``source``;
|
||||
- ``name`` is a submodule of ``source``.
|
||||
|
||||
Neither :func:`__import__` nor :func:`~importlib.import_module` does
|
||||
exactly this. :func:`__import__` is closer to the intended behavior.
|
||||
|
||||
"""
|
||||
level = 0
|
||||
while source[level] == ".":
|
||||
level += 1
|
||||
assert level < len(source), "importing from parent isn't supported"
|
||||
module = __import__(source[level:], namespace, None, [name], level)
|
||||
return getattr(module, name)
|
||||
|
||||
|
||||
def lazy_import(
|
||||
namespace: Dict[str, Any],
|
||||
aliases: Optional[Dict[str, str]] = None,
|
||||
deprecated_aliases: Optional[Dict[str, str]] = None,
|
||||
) -> None:
|
||||
"""
|
||||
Provide lazy, module-level imports.
|
||||
|
||||
Typical use::
|
||||
|
||||
__getattr__, __dir__ = lazy_import(
|
||||
globals(),
|
||||
aliases={
|
||||
"<name>": "<source module>",
|
||||
...
|
||||
},
|
||||
deprecated_aliases={
|
||||
...,
|
||||
}
|
||||
)
|
||||
|
||||
This function defines ``__getattr__`` and ``__dir__`` per :pep:`562`.
|
||||
|
||||
"""
|
||||
if aliases is None:
|
||||
aliases = {}
|
||||
if deprecated_aliases is None:
|
||||
deprecated_aliases = {}
|
||||
|
||||
namespace_set = set(namespace)
|
||||
aliases_set = set(aliases)
|
||||
deprecated_aliases_set = set(deprecated_aliases)
|
||||
|
||||
assert not namespace_set & aliases_set, "namespace conflict"
|
||||
assert not namespace_set & deprecated_aliases_set, "namespace conflict"
|
||||
assert not aliases_set & deprecated_aliases_set, "namespace conflict"
|
||||
|
||||
package = namespace["__name__"]
|
||||
|
||||
def __getattr__(name: str) -> Any:
|
||||
assert aliases is not None # mypy cannot figure this out
|
||||
try:
|
||||
source = aliases[name]
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
return import_name(name, source, namespace)
|
||||
|
||||
assert deprecated_aliases is not None # mypy cannot figure this out
|
||||
try:
|
||||
source = deprecated_aliases[name]
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
warnings.warn(
|
||||
f"{package}.{name} is deprecated",
|
||||
DeprecationWarning,
|
||||
stacklevel=2,
|
||||
)
|
||||
return import_name(name, source, namespace)
|
||||
|
||||
raise AttributeError(f"module {package!r} has no attribute {name!r}")
|
||||
|
||||
namespace["__getattr__"] = __getattr__
|
||||
|
||||
def __dir__() -> Iterable[str]:
|
||||
return sorted(namespace_set | aliases_set | deprecated_aliases_set)
|
||||
|
||||
namespace["__dir__"] = __dir__
|
||||
Reference in New Issue
Block a user