feat: refactored and added registration step

FreeTAKTeam · Sep 8, 2024 · f716303 · f716303
1 parent 93115c7
commit f716303
Show file tree

Hide file tree

Showing 23 changed files with 519 additions and 392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@ tmp1/
 tmp2/
 lxmf_storage/
 .vscode/
+telemetry.db
+RTH_Store/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/lxmf_telemetry/model/fields/field_telemetry_stream.py b/lxmf_telemetry/model/fields/field_telemetry_stream.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,18 +1,20 @@
 [tool.poetry]
-name = "reticulum-server"
-version = "0.1.0"
+name = "ReticulumTelemetryHub"
+version = "0.1.2"
 description = ""
-authors = ["naman108 <[email protected]>"]
+authors = ["naman108"]
 readme = "README.md"
+packages = [
+    { include = "reticulum_telemetry_hub" },
+]
 
 [tool.poetry.dependencies]
-python = "^3.12"
+python = "^3.10"
 lxmf = "^0.4.4"
 msgpack = "^1.0.8"
 sqlalchemy = "^2.0.32"
 pytest = "^8.3.2"
 
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
diff --git a/reticulum_server/main.py b/reticulum_server/main.py
diff --git a/lxmf_telemetry/__init__.py → reticulum_telemetry_hub/__init__.py b/lxmf_telemetry/__init__.py → reticulum_telemetry_hub/__init__.py
diff --git a/...try/model/persistance/sensors/__init__.py → ..._telemetry_hub/lxmf_telemetry/__init__.py b/...try/model/persistance/sensors/__init__.py → ..._telemetry_hub/lxmf_telemetry/__init__.py
diff --git a/reticulum_telemetry_hub/lxmf_telemetry/model/fields/field_telemetry_stream.py b/reticulum_telemetry_hub/lxmf_telemetry/model/fields/field_telemetry_stream.py
@@ -0,0 +1,7 @@
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.telemeter import Telemeter
+
+
+class FieldTelmetryStream():
+
+    telemeters: list[Telemeter]
+
diff --git a/lxmf_telemetry/model/persistance/__init__.py → ...f_telemetry/model/persistance/__init__.py b/lxmf_telemetry/model/persistance/__init__.py → ...f_telemetry/model/persistance/__init__.py
diff --git a/...telemetry/model/persistance/appearance.py → ...telemetry/model/persistance/appearance.py b/...telemetry/model/persistance/appearance.py → ...telemetry/model/persistance/appearance.py
diff --git a/lxmf_telemetry/model/persistance/peer.py → .../lxmf_telemetry/model/persistance/peer.py b/lxmf_telemetry/model/persistance/peer.py → .../lxmf_telemetry/model/persistance/peer.py
diff --git a/reticulum_server/__init__.py → ...try/model/persistance/sensors/__init__.py b/reticulum_server/__init__.py → ...try/model/persistance/sensors/__init__.py
diff --git a/...try/model/persistance/sensors/location.py → ...try/model/persistance/sensors/location.py b/...try/model/persistance/sensors/location.py → ...try/model/persistance/sensors/location.py
@@ -1,5 +1,5 @@
 from sqlalchemy import Column
-from lxmf_telemetry.model.persistance.sensors.sensor import Sensor
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.sensors.sensor import Sensor
 from .sensor_enum import SID_LOCATION
 import struct
 import RNS

diff --git a/...del/persistance/sensors/magnetic_field.py → ...del/persistance/sensors/magnetic_field.py b/...del/persistance/sensors/magnetic_field.py → ...del/persistance/sensors/magnetic_field.py
@@ -1,5 +1,5 @@
 from sqlalchemy import Column
-from lxmf_telemetry.model.persistance.sensors.sensor import Sensor
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.sensors.sensor import Sensor
 from .sensor_enum import SID_MAGNETIC_FIELD
 import struct
 import RNS

diff --git a/...metry/model/persistance/sensors/sensor.py → ...metry/model/persistance/sensors/sensor.py b/...metry/model/persistance/sensors/sensor.py → ...metry/model/persistance/sensors/sensor.py
diff --git a/.../model/persistance/sensors/sensor_enum.py → .../model/persistance/sensors/sensor_enum.py b/.../model/persistance/sensors/sensor_enum.py → .../model/persistance/sensors/sensor_enum.py
diff --git a/...del/persistance/sensors/sensor_mapping.py → ...del/persistance/sensors/sensor_mapping.py b/...del/persistance/sensors/sensor_mapping.py → ...del/persistance/sensors/sensor_mapping.py
diff --git a/...lemetry/model/persistance/sensors/time.py → ...lemetry/model/persistance/sensors/time.py b/...lemetry/model/persistance/sensors/time.py → ...lemetry/model/persistance/sensors/time.py
@@ -4,8 +4,8 @@
 from sqlalchemy import ForeignKey, DateTime
 from sqlalchemy.orm import Mapped, mapped_column
 
-from lxmf_telemetry.model.persistance.sensors.sensor_enum import SID_TIME
-from lxmf_telemetry.model.persistance.sensors.sensor import Sensor
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.sensors.sensor_enum import SID_TIME
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.sensors.sensor import Sensor
 
 class Time(Sensor):
     __tablename__ = 'Time'

diff --git a/..._telemetry/model/persistance/telemeter.py → ..._telemetry/model/persistance/telemeter.py b/..._telemetry/model/persistance/telemeter.py → ..._telemetry/model/persistance/telemeter.py
diff --git a/lxmf_telemetry/telemetry_controller.py → ...ub/lxmf_telemetry/telemetry_controller.py b/lxmf_telemetry/telemetry_controller.py → ...ub/lxmf_telemetry/telemetry_controller.py
@@ -3,11 +3,11 @@
 import LXMF
 import RNS
 from msgpack import packb, unpackb
-from lxmf_telemetry.model.persistance import Base
-from lxmf_telemetry.model.persistance.sensors.sensor import Sensor
-from lxmf_telemetry.model.persistance.telemeter import Telemeter
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance import Base
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.sensors.sensor import Sensor
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.telemeter import Telemeter
 
-from lxmf_telemetry.model.persistance.sensors.sensor_mapping import sid_mapping
+from reticulum_telemetry_hub.lxmf_telemetry.model.persistance.sensors.sensor_mapping import sid_mapping
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, Session, joinedload
 

diff --git a/reticulum_telemetry_hub/reticulum_server/__init__.py b/reticulum_telemetry_hub/reticulum_server/__init__.py