refactor(config): 重构配置模块并优化应用依赖注入
- 将配置相关类移动到model模块 - 实现依赖注入容器管理各组件依赖关系 - 重构配置加载逻辑支持多层级键值查找 - 更新主应用入口支持命令行参数解析 - 统一日志输出格式替换原有打印语句 - 引入钻井实时数据模型简化数据处理 - 移除硬编码字段映射改用动态配置方式 - 优化数据库写入逻辑基于新的数据模型
This commit is contained in:
137
app/mqtt_mock.py
137
app/mqtt_mock.py
@@ -1,5 +1,6 @@
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
from datetime import datetime
|
||||
@@ -7,57 +8,11 @@ from urllib.parse import urlparse
|
||||
|
||||
import paho.mqtt.client as mqtt
|
||||
|
||||
from config.config import build_mock_dependencies
|
||||
from config import build_mock_dependencies
|
||||
from model import DrillingRealtimeData
|
||||
|
||||
|
||||
DATA_KEYS = [
|
||||
"ts",
|
||||
"wellid",
|
||||
"stknum",
|
||||
"recid",
|
||||
"seqid",
|
||||
"actual_date",
|
||||
"actual_time",
|
||||
"actcod",
|
||||
"deptbitm",
|
||||
"deptbitv",
|
||||
"deptmeas",
|
||||
"deptvert",
|
||||
"blkpos",
|
||||
"ropa",
|
||||
"hkla",
|
||||
"hklx",
|
||||
"woba",
|
||||
"wobx",
|
||||
"torqa",
|
||||
"torqx",
|
||||
"rpma",
|
||||
"sppa",
|
||||
"chkp",
|
||||
"spm1",
|
||||
"spm2",
|
||||
"spm3",
|
||||
"tvolact",
|
||||
"tvolcact",
|
||||
"mfop",
|
||||
"mfoa",
|
||||
"mfia",
|
||||
"mdoa",
|
||||
"mdia",
|
||||
"mtoa",
|
||||
"mtia",
|
||||
"mcoa",
|
||||
"mcia",
|
||||
"stkc",
|
||||
"lagstks",
|
||||
"deptretm",
|
||||
"gasa",
|
||||
"space1",
|
||||
"space2",
|
||||
"space3",
|
||||
"space4",
|
||||
"space5",
|
||||
]
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def parse_broker(broker):
|
||||
@@ -81,16 +36,7 @@ def ensure_dir(path):
|
||||
|
||||
|
||||
def build_server_payload(equipment_code):
|
||||
data = {key: 0 for key in DATA_KEYS}
|
||||
data["ts"] = int(time.time() * 1000)
|
||||
data["wellid"] = ""
|
||||
return {
|
||||
"meta": {
|
||||
"equipment_code": equipment_code,
|
||||
"equipment_sn": equipment_code,
|
||||
},
|
||||
"data": data,
|
||||
}
|
||||
return DrillingRealtimeData.empty(wellid=equipment_code).to_payload(equipment_code)
|
||||
|
||||
|
||||
def parse_payload(raw_payload):
|
||||
@@ -146,67 +92,52 @@ def run_mock_service(args, deps):
|
||||
tdengine_writer = deps.tdengine_writer
|
||||
scheme, host, port = parse_broker(mqtt_config.broker)
|
||||
|
||||
print("MQTT mock config:")
|
||||
print(f" broker: {scheme}://{host}:{port}")
|
||||
print(f" client-id: {mqtt_config.mock_client_id}")
|
||||
print(f" pub-topic (ingest): {mqtt_config.pub_topic}")
|
||||
print(f" sub-topic (forward): {mqtt_config.sub_topic}")
|
||||
print(f" ack-topic: {mqtt_config.ack_topic}")
|
||||
print(f" data-file: {deps.data_file}")
|
||||
print(f" device-code: {tms_config.device_code}")
|
||||
print(f" tdengine enabled: {tdengine_writer.enabled}")
|
||||
logger.info("MQTT mock config broker=%s://%s:%s client_id=%s mode=%s", scheme, host, port, mqtt_config.mock_client_id, args.mode)
|
||||
logger.info("Topics ingest=%s forward=%s ack=%s", mqtt_config.pub_topic, mqtt_config.sub_topic, mqtt_config.ack_topic)
|
||||
logger.info("Data file=%s device_code=%s tdengine_enabled=%s", deps.data_file, tms_config.device_code, tdengine_writer.enabled)
|
||||
if tdengine_writer.enabled:
|
||||
print(f" tdengine host: {tdengine_config.base_url}")
|
||||
print(f" tdengine database: {tdengine_config.database}")
|
||||
print(f" tdengine stable: {tdengine_config.stable}")
|
||||
print(f" tdengine pool-size: {tdengine_config.pool_size}")
|
||||
print(f" mode: {args.mode}")
|
||||
logger.info("TDengine host=%s database=%s stable=%s pool_size=%s", tdengine_config.base_url, tdengine_config.database, tdengine_config.stable, tdengine_config.pool_size)
|
||||
|
||||
client = mqtt.Client(client_id=mqtt_config.mock_client_id, clean_session=True)
|
||||
if mqtt_config.username is not None:
|
||||
client.username_pw_set(mqtt_config.username, mqtt_config.password)
|
||||
|
||||
if scheme in ("ssl", "tls", "mqtts"):
|
||||
client.tls_set()
|
||||
|
||||
def on_connect(c, userdata, flags, rc):
|
||||
if rc == 0:
|
||||
print("Connected")
|
||||
logger.info("Connected")
|
||||
else:
|
||||
print(f"Connect failed rc={rc}")
|
||||
logger.error("Connect failed rc=%s", rc)
|
||||
return
|
||||
if args.mode in ("listen", "both") and mqtt_config.pub_topic:
|
||||
c.subscribe(mqtt_config.pub_topic)
|
||||
print(f"Subscribed: {mqtt_config.pub_topic}")
|
||||
logger.info("Subscribed %s", mqtt_config.pub_topic)
|
||||
|
||||
def on_disconnect(c, userdata, rc):
|
||||
print(f"Disconnected callback rc={rc}")
|
||||
logger.info("Disconnected callback rc=%s", rc)
|
||||
|
||||
def on_message(c, userdata, msg):
|
||||
payload = msg.payload.decode("utf-8", errors="replace")
|
||||
print(f"RX {msg.topic}: {payload}")
|
||||
logger.info("RX topic=%s bytes=%s", msg.topic, len(msg.payload))
|
||||
if msg.topic != mqtt_config.pub_topic:
|
||||
return
|
||||
|
||||
if deps.data_file:
|
||||
write_message(deps.data_file, msg.topic, payload)
|
||||
print(f"Wrote to file: {deps.data_file}")
|
||||
|
||||
logger.info("Wrote file %s", deps.data_file)
|
||||
if tdengine_writer.enabled:
|
||||
try:
|
||||
tdengine_writer.write_payload(parse_payload(payload))
|
||||
print("Wrote to TDengine")
|
||||
except Exception as exc:
|
||||
print(f"Write TDengine failed: {exc}")
|
||||
|
||||
logger.info("Wrote TDengine")
|
||||
except Exception:
|
||||
logger.exception("Write TDengine failed")
|
||||
if mqtt_config.sub_topic:
|
||||
c.publish(mqtt_config.sub_topic, payload)
|
||||
print(f"Forwarded to {mqtt_config.sub_topic}")
|
||||
|
||||
logger.info("Forwarded %s", mqtt_config.sub_topic)
|
||||
if mqtt_config.ack_topic:
|
||||
ack_payload = build_ack_payload(msg.topic, payload)
|
||||
c.publish(mqtt_config.ack_topic, json.dumps(ack_payload, ensure_ascii=True))
|
||||
print(f"TX {mqtt_config.ack_topic}: {ack_payload}")
|
||||
logger.info("TX ack %s", mqtt_config.ack_topic)
|
||||
|
||||
client.on_connect = on_connect
|
||||
client.on_disconnect = on_disconnect
|
||||
@@ -217,14 +148,14 @@ def run_mock_service(args, deps):
|
||||
try:
|
||||
if args.mode in ("publish", "both"):
|
||||
if not mqtt_config.pub_topic:
|
||||
print("pub-topic is empty; nothing to publish")
|
||||
logger.warning("pub-topic is empty; nothing to publish")
|
||||
else:
|
||||
seq = 0
|
||||
while True:
|
||||
seq += 1
|
||||
payload = build_server_payload(tms_config.device_code)
|
||||
client.publish(mqtt_config.pub_topic, json.dumps(payload, ensure_ascii=True))
|
||||
print(f"TX {mqtt_config.pub_topic}: {payload}")
|
||||
logger.info("TX %s #%s", mqtt_config.pub_topic, seq)
|
||||
if args.count and seq >= args.count:
|
||||
break
|
||||
time.sleep(args.interval)
|
||||
@@ -232,21 +163,25 @@ def run_mock_service(args, deps):
|
||||
while True:
|
||||
time.sleep(1)
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
logger.info("Mock interrupted")
|
||||
finally:
|
||||
client.loop_stop()
|
||||
client.disconnect()
|
||||
print("Disconnected")
|
||||
logger.info("Mock stopped")
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description="MQTT mock service")
|
||||
ap.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
ap.add_argument("--mode", choices=["publish", "listen", "both"], default="listen")
|
||||
ap.add_argument("--interval", type=float, default=2.0, help="Publish interval (seconds)")
|
||||
ap.add_argument("--count", type=int, default=0, help="Publish count (0 = forever)")
|
||||
ap.add_argument("--data-file", default="", help="Override data-file in config")
|
||||
args = ap.parse_args()
|
||||
def add_arguments(parser):
|
||||
parser.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
parser.add_argument("--mode", choices=["publish", "listen", "both"], default="listen")
|
||||
parser.add_argument("--interval", type=float, default=2.0, help="Publish interval (seconds)")
|
||||
parser.add_argument("--count", type=int, default=0, help="Publish count (0 = forever)")
|
||||
parser.add_argument("--data-file", default="", help="Override data-file in config")
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
parser = argparse.ArgumentParser(description="MQTT mock service")
|
||||
add_arguments(parser)
|
||||
args = parser.parse_args(argv)
|
||||
deps = build_mock_dependencies(args.config, data_file_override=args.data_file)
|
||||
run_mock_service(args, deps)
|
||||
|
||||
|
||||
@@ -1,63 +1,17 @@
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import random
|
||||
import time
|
||||
from datetime import datetime
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import paho.mqtt.client as mqtt
|
||||
|
||||
from config.config import build_sender_dependencies
|
||||
from config import build_sender_dependencies
|
||||
from model import DrillingRealtimeData
|
||||
|
||||
|
||||
DATA_KEYS = [
|
||||
"ts",
|
||||
"wellid",
|
||||
"stknum",
|
||||
"recid",
|
||||
"seqid",
|
||||
"actual_date",
|
||||
"actual_time",
|
||||
"actcod",
|
||||
"deptbitm",
|
||||
"deptbitv",
|
||||
"deptmeas",
|
||||
"deptvert",
|
||||
"blkpos",
|
||||
"ropa",
|
||||
"hkla",
|
||||
"hklx",
|
||||
"woba",
|
||||
"wobx",
|
||||
"torqa",
|
||||
"torqx",
|
||||
"rpma",
|
||||
"sppa",
|
||||
"chkp",
|
||||
"spm1",
|
||||
"spm2",
|
||||
"spm3",
|
||||
"tvolact",
|
||||
"tvolcact",
|
||||
"mfop",
|
||||
"mfoa",
|
||||
"mfia",
|
||||
"mdoa",
|
||||
"mdia",
|
||||
"mtoa",
|
||||
"mtia",
|
||||
"mcoa",
|
||||
"mcia",
|
||||
"stkc",
|
||||
"lagstks",
|
||||
"deptretm",
|
||||
"gasa",
|
||||
"space1",
|
||||
"space2",
|
||||
"space3",
|
||||
"space4",
|
||||
"space5",
|
||||
]
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def parse_broker(broker):
|
||||
@@ -76,61 +30,61 @@ def rand_int(a, b):
|
||||
return random.randint(a, b)
|
||||
|
||||
|
||||
def rand_float(a, b, digits=2):
|
||||
return round(random.uniform(a, b), digits)
|
||||
|
||||
|
||||
def build_random_payload(equipment_code):
|
||||
data = {key: 0 for key in DATA_KEYS}
|
||||
data["ts"] = int(time.time() * 1000)
|
||||
data["wellid"] = random.choice(["", f"WELL-{rand_int(1, 9999):04d}"])
|
||||
data["stknum"] = rand_int(0, 500)
|
||||
data["recid"] = rand_int(0, 100000)
|
||||
data["seqid"] = rand_int(0, 100000)
|
||||
data["actual_date"] = int(datetime.utcnow().strftime("%Y%m%d"))
|
||||
data["actual_time"] = int(datetime.utcnow().strftime("%H%M%S"))
|
||||
data["actcod"] = rand_int(0, 9)
|
||||
data["deptbitm"] = rand_int(0, 5000)
|
||||
data["deptbitv"] = rand_int(0, 5000)
|
||||
data["deptmeas"] = rand_int(0, 5000)
|
||||
data["deptvert"] = rand_int(0, 5000)
|
||||
data["blkpos"] = rand_int(0, 100)
|
||||
data["ropa"] = rand_int(0, 200)
|
||||
data["hkla"] = rand_int(0, 500)
|
||||
data["hklx"] = rand_int(0, 500)
|
||||
data["woba"] = rand_int(0, 200)
|
||||
data["wobx"] = rand_int(0, 200)
|
||||
data["torqa"] = rand_int(0, 200)
|
||||
data["torqx"] = rand_int(0, 200)
|
||||
data["rpma"] = rand_int(0, 300)
|
||||
data["sppa"] = rand_int(0, 5000)
|
||||
data["chkp"] = rand_int(0, 5000)
|
||||
data["spm1"] = rand_int(0, 200)
|
||||
data["spm2"] = rand_int(0, 200)
|
||||
data["spm3"] = rand_int(0, 200)
|
||||
data["tvolact"] = rand_int(0, 20000)
|
||||
data["tvolcact"] = rand_int(0, 20000)
|
||||
data["mfop"] = rand_int(0, 1000)
|
||||
data["mfoa"] = rand_int(0, 1000)
|
||||
data["mfia"] = rand_int(0, 1000)
|
||||
data["mdoa"] = rand_int(0, 1000)
|
||||
data["mdia"] = rand_int(0, 1000)
|
||||
data["mtoa"] = rand_int(0, 1000)
|
||||
data["mtia"] = rand_int(0, 1000)
|
||||
data["mcoa"] = rand_int(0, 1000)
|
||||
data["mcia"] = rand_int(0, 1000)
|
||||
data["stkc"] = rand_int(0, 200)
|
||||
data["lagstks"] = rand_int(0, 200)
|
||||
data["deptretm"] = rand_int(0, 5000)
|
||||
data["gasa"] = rand_int(0, 100)
|
||||
data["space1"] = rand_int(0, 10)
|
||||
data["space2"] = rand_int(0, 10)
|
||||
data["space3"] = rand_int(0, 10)
|
||||
data["space4"] = rand_int(0, 10)
|
||||
data["space5"] = rand_int(0, 10)
|
||||
return {
|
||||
"meta": {
|
||||
"equipment_code": equipment_code,
|
||||
"equipment_sn": equipment_code,
|
||||
},
|
||||
"data": data,
|
||||
}
|
||||
entity = DrillingRealtimeData.empty(wellid=equipment_code)
|
||||
entity = DrillingRealtimeData(
|
||||
ts=entity.ts,
|
||||
wellid=entity.wellid,
|
||||
stknum=rand_int(0, 500),
|
||||
recid=rand_int(0, 100000),
|
||||
seqid=rand_int(0, 100000),
|
||||
actual_date=entity.actual_date,
|
||||
actual_time=entity.actual_time,
|
||||
actcod=rand_int(0, 9),
|
||||
deptbitm=rand_float(0, 5000),
|
||||
deptbitv=rand_float(0, 5000),
|
||||
deptmeas=rand_float(0, 5000),
|
||||
deptvert=rand_float(0, 5000),
|
||||
blkpos=rand_float(0, 100),
|
||||
ropa=rand_float(0, 200),
|
||||
hkla=rand_float(0, 500),
|
||||
hklx=rand_float(0, 500),
|
||||
woba=rand_float(0, 200),
|
||||
wobx=rand_float(0, 200),
|
||||
torqa=rand_float(0, 200),
|
||||
torqx=rand_float(0, 200),
|
||||
rpma=rand_int(0, 300),
|
||||
sppa=rand_float(0, 5000),
|
||||
chkp=rand_float(0, 5000),
|
||||
spm1=rand_int(0, 200),
|
||||
spm2=rand_int(0, 200),
|
||||
spm3=rand_int(0, 200),
|
||||
tvolact=rand_float(0, 20000),
|
||||
tvolcact=rand_float(0, 20000),
|
||||
mfop=rand_int(0, 1000),
|
||||
mfoa=rand_float(0, 1000),
|
||||
mfia=rand_float(0, 1000),
|
||||
mdoa=rand_float(0, 1000),
|
||||
mdia=rand_float(0, 1000),
|
||||
mtoa=rand_float(0, 1000),
|
||||
mtia=rand_float(0, 1000),
|
||||
mcoa=rand_float(0, 1000),
|
||||
mcia=rand_float(0, 1000),
|
||||
stkc=rand_int(0, 200),
|
||||
lagstks=rand_int(0, 200),
|
||||
deptretm=rand_float(0, 5000),
|
||||
gasa=rand_float(0, 100),
|
||||
space1=rand_float(0, 10),
|
||||
space2=rand_float(0, 10),
|
||||
space3=rand_float(0, 10),
|
||||
space4=rand_float(0, 10),
|
||||
space5=rand_float(0, 10),
|
||||
)
|
||||
return entity.to_payload(equipment_code)
|
||||
|
||||
|
||||
def run_sender(args, deps):
|
||||
@@ -138,21 +92,16 @@ def run_sender(args, deps):
|
||||
tms_config = deps.config.tms
|
||||
scheme, host, port = parse_broker(mqtt_config.broker)
|
||||
|
||||
print("MQTT sender config:")
|
||||
print(f" broker: {scheme}://{host}:{port}")
|
||||
print(f" client-id: {mqtt_config.sender_client_id}")
|
||||
print(f" pub-topic: {mqtt_config.pub_topic}")
|
||||
print(f" interval: {args.interval}s")
|
||||
logger.info("MQTT sender config broker=%s://%s:%s client_id=%s pub_topic=%s interval=%ss", scheme, host, port, mqtt_config.sender_client_id, mqtt_config.pub_topic, args.interval)
|
||||
|
||||
client = mqtt.Client(client_id=mqtt_config.sender_client_id, clean_session=True)
|
||||
if mqtt_config.username is not None:
|
||||
client.username_pw_set(mqtt_config.username, mqtt_config.password)
|
||||
|
||||
if scheme in ("ssl", "tls", "mqtts"):
|
||||
client.tls_set()
|
||||
|
||||
def on_disconnect(c, userdata, rc):
|
||||
print(f"Disconnected callback rc={rc}")
|
||||
logger.info("Disconnected callback rc=%s", rc)
|
||||
|
||||
client.on_disconnect = on_disconnect
|
||||
client.connect(host, port, keepalive=tms_config.keepalive)
|
||||
@@ -160,31 +109,35 @@ def run_sender(args, deps):
|
||||
|
||||
try:
|
||||
if not mqtt_config.pub_topic:
|
||||
print("pub-topic is empty; nothing to publish")
|
||||
logger.warning("pub-topic is empty; nothing to publish")
|
||||
return
|
||||
seq = 0
|
||||
while True:
|
||||
seq += 1
|
||||
payload = build_random_payload(tms_config.device_code)
|
||||
client.publish(mqtt_config.pub_topic, json.dumps(payload, ensure_ascii=True))
|
||||
print(f"TX {mqtt_config.pub_topic}: {payload}")
|
||||
logger.info("TX %s #%s", mqtt_config.pub_topic, seq)
|
||||
if args.count and seq >= args.count:
|
||||
break
|
||||
time.sleep(args.interval)
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
logger.info("Sender interrupted")
|
||||
finally:
|
||||
client.loop_stop()
|
||||
client.disconnect()
|
||||
print("Disconnected")
|
||||
logger.info("Sender stopped")
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description="MQTT random data sender")
|
||||
ap.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
ap.add_argument("--interval", type=float, default=3.0, help="Publish interval (seconds)")
|
||||
ap.add_argument("--count", type=int, default=0, help="Publish count (0 = forever)")
|
||||
args = ap.parse_args()
|
||||
def add_arguments(parser):
|
||||
parser.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
parser.add_argument("--interval", type=float, default=3.0, help="Publish interval (seconds)")
|
||||
parser.add_argument("--count", type=int, default=0, help="Publish count (0 = forever)")
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
parser = argparse.ArgumentParser(description="MQTT random data sender")
|
||||
add_arguments(parser)
|
||||
args = parser.parse_args(argv)
|
||||
deps = build_sender_dependencies(args.config)
|
||||
run_sender(args, deps)
|
||||
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import time
|
||||
from datetime import datetime
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import paho.mqtt.client as mqtt
|
||||
|
||||
from config.config import build_subscriber_dependencies
|
||||
from config import build_subscriber_dependencies
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def parse_broker(broker):
|
||||
@@ -22,12 +26,12 @@ def parse_broker(broker):
|
||||
|
||||
|
||||
def print_flat_fields(title, value):
|
||||
print(title)
|
||||
logger.info(title)
|
||||
if isinstance(value, dict):
|
||||
for k, v in value.items():
|
||||
print(f" {k}: {v}")
|
||||
for key, val in value.items():
|
||||
logger.info(" %s: %s", key, val)
|
||||
else:
|
||||
print(f" {value}")
|
||||
logger.info(" %s", value)
|
||||
|
||||
|
||||
def run_subscriber(args, deps):
|
||||
@@ -38,49 +42,36 @@ def run_subscriber(args, deps):
|
||||
raise ValueError("No topic to subscribe. Set sub-topic or pub-topic, or pass --topic")
|
||||
|
||||
scheme, host, port = parse_broker(mqtt_config.broker)
|
||||
|
||||
print("MQTT subscriber config:")
|
||||
print(f" broker: {scheme}://{host}:{port}")
|
||||
print(f" client-id: {mqtt_config.subscriber_client_id}")
|
||||
print(f" topic: {topic}")
|
||||
logger.info("MQTT subscriber config broker=%s://%s:%s client_id=%s topic=%s", scheme, host, port, mqtt_config.subscriber_client_id, topic)
|
||||
|
||||
client = mqtt.Client(client_id=mqtt_config.subscriber_client_id, clean_session=True)
|
||||
if mqtt_config.username is not None:
|
||||
client.username_pw_set(mqtt_config.username, mqtt_config.password)
|
||||
|
||||
if scheme in ("ssl", "tls", "mqtts"):
|
||||
client.tls_set()
|
||||
|
||||
def on_connect(c, userdata, flags, rc):
|
||||
if rc == 0:
|
||||
print("Connected")
|
||||
logger.info("Connected")
|
||||
c.subscribe(topic)
|
||||
print(f"Subscribed: {topic}")
|
||||
logger.info("Subscribed %s", topic)
|
||||
else:
|
||||
print(f"Connect failed rc={rc}")
|
||||
logger.error("Connect failed rc=%s", rc)
|
||||
|
||||
def on_disconnect(c, userdata, rc):
|
||||
print(f"Disconnected callback rc={rc}")
|
||||
logger.info("Disconnected callback rc=%s", rc)
|
||||
|
||||
def on_message(c, userdata, msg):
|
||||
raw_payload = msg.payload.decode("utf-8", errors="replace")
|
||||
print("=" * 80)
|
||||
print(f"RX Time: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
|
||||
print(f"Topic: {msg.topic}")
|
||||
print(f"QoS: {msg.qos}, Retain: {msg.retain}, Bytes: {len(msg.payload)}")
|
||||
logger.info("RX time=%s topic=%s qos=%s retain=%s bytes=%s", datetime.now().strftime('%Y-%m-%d %H:%M:%S'), msg.topic, msg.qos, msg.retain, len(msg.payload))
|
||||
try:
|
||||
obj = json.loads(raw_payload)
|
||||
print("Raw JSON:")
|
||||
print(json.dumps(obj, ensure_ascii=False, indent=2))
|
||||
logger.info("Raw JSON: %s", json.dumps(obj, ensure_ascii=False))
|
||||
if isinstance(obj, dict):
|
||||
print_flat_fields("meta:", obj.get("meta"))
|
||||
print_flat_fields("data:", obj.get("data"))
|
||||
extra_keys = [key for key in obj.keys() if key not in ("meta", "data")]
|
||||
for key in extra_keys:
|
||||
print_flat_fields(f"{key}:", obj.get(key))
|
||||
except Exception:
|
||||
print("Raw payload:")
|
||||
print(raw_payload)
|
||||
logger.info("Raw payload: %s", raw_payload)
|
||||
|
||||
client.on_connect = on_connect
|
||||
client.on_disconnect = on_disconnect
|
||||
@@ -92,18 +83,22 @@ def run_subscriber(args, deps):
|
||||
while True:
|
||||
time.sleep(1)
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
logger.info("Subscriber interrupted")
|
||||
finally:
|
||||
client.loop_stop()
|
||||
client.disconnect()
|
||||
print("Disconnected")
|
||||
logger.info("Subscriber stopped")
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description="MQTT subscriber")
|
||||
ap.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
ap.add_argument("--topic", default="", help="Override topic to subscribe")
|
||||
args = ap.parse_args()
|
||||
def add_arguments(parser):
|
||||
parser.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
parser.add_argument("--topic", default="", help="Override topic to subscribe")
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
parser = argparse.ArgumentParser(description="MQTT subscriber")
|
||||
add_arguments(parser)
|
||||
args = parser.parse_args(argv)
|
||||
deps = build_subscriber_dependencies(args.config)
|
||||
run_subscriber(args, deps)
|
||||
|
||||
|
||||
@@ -1,119 +1,20 @@
|
||||
import argparse
|
||||
import logging
|
||||
import random
|
||||
import socket
|
||||
import time
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
from config.dependencies import build_wits_sender_dependencies
|
||||
from config import build_wits_sender_dependencies
|
||||
from model import WITS_FIELD_MAPPING, WitsData
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
BEGIN_MARK = "&&\r\n"
|
||||
END_MARK = "!!\r\n"
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class WitsData:
|
||||
ts: int
|
||||
wellid: str
|
||||
stknum: int
|
||||
recid: int
|
||||
seqid: int
|
||||
actual_date: float
|
||||
actual_time: float
|
||||
actual_ts: int
|
||||
actcod: int
|
||||
actod_label: str
|
||||
deptbitm: float
|
||||
deptbitv: float
|
||||
deptmeas: float
|
||||
deptvert: float
|
||||
blkpos: float
|
||||
ropa: float
|
||||
hkla: float
|
||||
hklx: float
|
||||
woba: float
|
||||
wobx: float
|
||||
torqa: float
|
||||
torqx: float
|
||||
rpma: int
|
||||
sppa: float
|
||||
chkp: float
|
||||
spm1: int
|
||||
spm2: int
|
||||
spm3: int
|
||||
tvolact: float
|
||||
tvolcact: float
|
||||
mfop: int
|
||||
mfoa: float
|
||||
mfia: float
|
||||
mdoa: float
|
||||
mdia: float
|
||||
mtoa: float
|
||||
mtia: float
|
||||
mcoa: float
|
||||
mcia: float
|
||||
stkc: int
|
||||
lagstks: int
|
||||
deptretm: float
|
||||
gasa: float
|
||||
space1: float
|
||||
space2: float
|
||||
space3: float
|
||||
space4: float
|
||||
space5: float
|
||||
|
||||
|
||||
WITS_FIELD_MAPPING = [
|
||||
(1, "wellid", "string"),
|
||||
(2, "stknum", "int"),
|
||||
(3, "recid", "int"),
|
||||
(4, "seqid", "int"),
|
||||
(5, "actual_date", "float"),
|
||||
(6, "actual_time", "float"),
|
||||
(7, "actcod", "int"),
|
||||
(8, "deptbitm", "float"),
|
||||
(9, "deptbitv", "float"),
|
||||
(10, "deptmeas", "float"),
|
||||
(11, "deptvert", "float"),
|
||||
(12, "blkpos", "float"),
|
||||
(13, "ropa", "float"),
|
||||
(14, "hkla", "float"),
|
||||
(15, "hklx", "float"),
|
||||
(16, "woba", "float"),
|
||||
(17, "wobx", "float"),
|
||||
(18, "torqa", "float"),
|
||||
(19, "torqx", "float"),
|
||||
(20, "rpma", "int"),
|
||||
(21, "sppa", "float"),
|
||||
(22, "chkp", "float"),
|
||||
(23, "spm1", "int"),
|
||||
(24, "spm2", "int"),
|
||||
(25, "spm3", "int"),
|
||||
(26, "tvolact", "float"),
|
||||
(27, "tvolcact", "float"),
|
||||
(28, "mfop", "int"),
|
||||
(29, "mfoa", "float"),
|
||||
(30, "mfia", "float"),
|
||||
(31, "mdoa", "float"),
|
||||
(32, "mdia", "float"),
|
||||
(33, "mtoa", "float"),
|
||||
(34, "mtia", "float"),
|
||||
(35, "mcoa", "float"),
|
||||
(36, "mcia", "float"),
|
||||
(37, "stkc", "int"),
|
||||
(38, "lagstks", "int"),
|
||||
(39, "deptretm", "float"),
|
||||
(40, "gasa", "float"),
|
||||
(41, "space1", "float"),
|
||||
(42, "space2", "float"),
|
||||
(43, "space3", "float"),
|
||||
(44, "space4", "float"),
|
||||
(45, "space5", "float"),
|
||||
]
|
||||
|
||||
|
||||
def rand_int(a, b):
|
||||
return random.randint(a, b)
|
||||
|
||||
@@ -219,17 +120,10 @@ def run_wits_sender(args, deps):
|
||||
host = args.host or wits_config.host
|
||||
port = args.port or wits_config.port
|
||||
timeout = args.timeout or wits_config.timeout
|
||||
|
||||
if not host or not port:
|
||||
raise ValueError("WITS target host/port is empty. Configure wits.host/wits.port or tms.server-ip/tms.server-port")
|
||||
|
||||
print("WITS sender config:")
|
||||
print(f" host: {host}")
|
||||
print(f" port: {port}")
|
||||
print(f" timeout: {timeout}s")
|
||||
print(f" source-file: {source_file or '(generated)'}")
|
||||
print(f" interval: {args.interval}s")
|
||||
print(f" count: {args.count or 'forever'}")
|
||||
logger.info("WITS sender config host=%s port=%s timeout=%ss source_file=%s interval=%ss count=%s", host, port, timeout, source_file or "(generated)", args.interval, args.count or "forever")
|
||||
|
||||
seq = 0
|
||||
try:
|
||||
@@ -240,29 +134,33 @@ def run_wits_sender(args, deps):
|
||||
else:
|
||||
packet = build_wits_packet(build_random_wits_data(device_code))
|
||||
send_packet(host, port, timeout, packet)
|
||||
print(f"TX WITS #{seq} -> {host}:{port}")
|
||||
print(packet)
|
||||
logger.info("TX WITS #%s -> %s:%s", seq, host, port)
|
||||
if logger.isEnabledFor(logging.DEBUG):
|
||||
logger.debug("WITS packet:\n%s", packet)
|
||||
if args.count and seq >= args.count:
|
||||
break
|
||||
time.sleep(args.interval)
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
logger.info("WITS sender interrupted")
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description="WITS TCP sender")
|
||||
ap.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
ap.add_argument("--host", default="", help="Override target host")
|
||||
ap.add_argument("--port", type=int, default=0, help="Override target port")
|
||||
ap.add_argument("--timeout", type=int, default=0, help="Override socket timeout")
|
||||
ap.add_argument("--source-file", default="", help="Send raw WITS packet from file")
|
||||
ap.add_argument("--interval", type=float, default=3.0, help="Send interval in seconds")
|
||||
ap.add_argument("--count", type=int, default=1, help="Send count (0 = forever)")
|
||||
args = ap.parse_args()
|
||||
def add_arguments(parser):
|
||||
parser.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
parser.add_argument("--host", default="", help="Override target host")
|
||||
parser.add_argument("--port", type=int, default=0, help="Override target port")
|
||||
parser.add_argument("--timeout", type=int, default=0, help="Override socket timeout")
|
||||
parser.add_argument("--source-file", default="", help="Send raw WITS packet from file")
|
||||
parser.add_argument("--interval", type=float, default=3.0, help="Send interval in seconds")
|
||||
parser.add_argument("--count", type=int, default=1, help="Send count (0 = forever)")
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
parser = argparse.ArgumentParser(description="WITS TCP sender")
|
||||
add_arguments(parser)
|
||||
args = parser.parse_args(argv)
|
||||
deps = build_wits_sender_dependencies(args.config)
|
||||
run_wits_sender(args, deps)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user