tangram-system 0.2.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

tangram_system/SystemWidget.vue

@@ -68,16 +68,20 @@ const local_time = computed(() => {
 
 <style scoped>
 #uptime {
-  color: #79706e;
+  color: var(--t-muted);
   font-size: 9pt;
   text-align: center;
 }
 
+.clock {
+  color: var(--t-fg);
+}
+
 .system-widget {
   display: flex;
   flex-direction: column;
   align-items: center;
   padding: 1px;
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid var(--t-border);
 }
 </style>

tangram_system/__init__.py

@@ -2,25 +2,29 @@ import asyncio
 import logging
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
-from typing import Any, NoReturn
+from typing import Annotated, NoReturn
 
 import orjson
 import psutil
 import redis.asyncio as redis
 import tangram_core
+from tangram_core.config import FrontendMutable
 
 log = logging.getLogger(__name__)
 
 
 @dataclass
-class SystemConfig(tangram_core.config.HasSidebarUiConfig):
+class SystemConfig:
     topbar_order: int = 0
 
 
-def transform_config(config_dict: dict[str, Any]) -> SystemConfig:
-    from pydantic import TypeAdapter
+@dataclass
+class SystemFrontendConfig(tangram_core.config.HasTopbarUiConfig):
+    topbar_order: Annotated[int, FrontendMutable()]
+
 
-    return TypeAdapter(SystemConfig).validate_python(config_dict)
+def into_frontend(config: SystemConfig) -> SystemFrontendConfig:
+    return SystemFrontendConfig(topbar_order=config.topbar_order)
 
 
 def uptime(counter: int) -> dict[str, str]:
@@ -72,7 +76,10 @@ async def server_events(redis_client: redis.Redis) -> NoReturn:
 
 
 plugin = tangram_core.Plugin(
-    frontend_path="dist-frontend", into_frontend_config_function=transform_config
+    frontend_path="dist-frontend",
+    config_class=SystemConfig,
+    frontend_config_class=SystemFrontendConfig,
+    into_frontend_config_function=into_frontend,
 )
 
 

tangram_system/dist-frontend/index.css

@@ -1 +1 @@
-#uptime[data-v-6e31ee8b]{color:#79706e;font-size:9pt;text-align:center}.system-widget[data-v-6e31ee8b]{display:flex;flex-direction:column;align-items:center;padding:1px;border-bottom:1px solid #ddd}
+#uptime[data-v-dc11558d]{color:var(--t-muted);font-size:9pt;text-align:center}.clock[data-v-dc11558d]{color:var(--t-fg)}.system-widget[data-v-dc11558d]{display:flex;flex-direction:column;align-items:center;padding:1px;border-bottom:1px solid var(--t-border)}

tangram_system/dist-frontend/index.js

@@ -1,4 +1,4 @@
-import { defineComponent as l, inject as _, reactive as g, onMounted as f, onUnmounted as v, computed as u, createElementBlock as S, openBlock as h, createElementVNode as c, toDisplayString as d } from "vue";
+import { defineComponent as l, inject as _, reactive as g, onMounted as f, onUnmounted as v, computed as d, createElementBlock as S, openBlock as h, createElementVNode as c, toDisplayString as u } from "vue";
 const w = { class: "system-widget" }, y = { id: "info_time" }, b = { id: "uptime" }, T = /* @__PURE__ */ l({
   __name: "SystemWidget",
   setup(s) {
@@ -25,10 +25,10 @@ const w = { class: "system-widget" }, y = { id: "info_time" }, b = { id: "uptime
     }), v(() => {
       i?.dispose();
     });
-    const r = u(() => {
+    const r = d(() => {
       const t = new Date(e.info_utc), n = t.getUTCHours().toString().padStart(2, "0"), a = t.getUTCMinutes().toString().padStart(2, "0"), p = t.getUTCSeconds().toString().padStart(2, "0");
       return `${n}:${a}:${p} Z`;
-    }), m = u(() => new Date(e.info_utc).toLocaleTimeString([], {
+    }), m = d(() => new Date(e.info_utc).toLocaleTimeString([], {
       hour: "2-digit",
       minute: "2-digit",
       second: "2-digit",
@@ -41,9 +41,9 @@ const w = { class: "system-widget" }, y = { id: "info_time" }, b = { id: "uptime
         onMouseover: n[0] || (n[0] = (a) => e.hovered = !0),
         onMouseleave: n[1] || (n[1] = (a) => e.hovered = !1)
       }, [
-        c("span", y, d(e.hovered ? m.value : r.value), 1)
+        c("span", y, u(e.hovered ? m.value : r.value), 1)
       ], 32),
-      c("span", b, d(e.uptime), 1)
+      c("span", b, u(e.uptime), 1)
     ]));
   }
 }), $ = (s, o) => {
@@ -51,7 +51,7 @@ const w = { class: "system-widget" }, y = { id: "info_time" }, b = { id: "uptime
   for (const [i, r] of o)
     e[i] = r;
   return e;
-}, k = /* @__PURE__ */ $(T, [["__scopeId", "data-v-6e31ee8b"]]);
+}, k = /* @__PURE__ */ $(T, [["__scopeId", "data-v-dc11558d"]]);
 function D(s, o) {
   s.ui.registerWidget("system-widget", "TopBar", k, {
     priority: o?.topbar_order

tangram_system/dist-frontend/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/tangram_system/SystemWidget.vue","../src/tangram_system/index.ts"],"sourcesContent":["<template>\n  <div class=\"system-widget\">\n    <div\n      class=\"clock\"\n      @mouseover=\"state.hovered = true\"\n      @mouseleave=\"state.hovered = false\"\n    >\n      <span id=\"info_time\">{{ state.hovered ? local_time : utc_time }}</span>\n    </div>\n    <span id=\"uptime\">{{ state.uptime }}</span>\n  </div>\n</template>\n\n<script setup lang=\"ts\">\nimport { reactive, computed, inject, onMounted, onUnmounted } from \"vue\";\nimport type { TangramApi, Disposable } from \"@open-aviation/tangram-core/api\";\n\nconst tangramApi = inject<TangramApi>(\"tangramApi\");\nif (!tangramApi) {\n  throw new Error(\"assert: tangram api not provided\");\n}\n\nconst state = reactive({\n  hovered: false,\n  uptime: \"\",\n  info_utc: new Date().getTime()\n});\n\nlet subscription: Disposable | null = null;\n\nonMounted(async () => {\n  try {\n    subscription = await tangramApi.realtime.subscribe(\n      \"system:update-node\",\n      (payload: { el: string; value: string | number }) => {\n        if (payload.el === \"uptime\") state.uptime = payload.value as string;\n        if (payload.el === \"info_utc\") state.info_utc = payload.value as number;\n      }\n    );\n  } catch (e) {\n    console.error(\"failed to subscribe to system:update-node\", e);\n  }\n});\n\nonUnmounted(() => {\n  subscription?.dispose();\n});\n\nconst utc_time = computed(() => {\n  const date = new Date(state.info_utc);\n  const hours = date.getUTCHours().toString().padStart(2, \"0\");\n  const minutes = date.getUTCMinutes().toString().padStart(2, \"0\");\n  const seconds = date.getUTCSeconds().toString().padStart(2, \"0\");\n  return `${hours}:${minutes}:${seconds} Z`;\n});\n\nconst local_time = computed(() => {\n  const date = new Date(state.info_utc);\n  return date.toLocaleTimeString([], {\n    hour: \"2-digit\",\n    minute: \"2-digit\",\n    second: \"2-digit\",\n    hour12: false,\n    timeZoneName: \"shortOffset\"\n  });\n});\n</script>\n\n<style scoped>\n#uptime {\n  color: #79706e;\n  font-size: 9pt;\n  text-align: center;\n}\n\n.system-widget {\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  padding: 1px;\n  border-bottom: 1px solid #ddd;\n}\n</style>\n","import type { TangramApi } from \"@open-aviation/tangram-core/api\";\nimport SystemWidget from \"./SystemWidget.vue\";\n\ninterface SystemConfig {\n  topbar_order: number;\n}\n\nexport function install(api: TangramApi, config?: SystemConfig) {\n  api.ui.registerWidget(\"system-widget\", \"TopBar\", SystemWidget, {\n    priority: config?.topbar_order\n  });\n}\n"],"names":["tangramApi","inject","state","reactive","subscription","onMounted","payload","e","onUnmounted","utc_time","computed","date","hours","minutes","seconds","local_time","_openBlock","_createElementBlock","_hoisted_1","_createElementVNode","_cache","$event","_hoisted_2","_toDisplayString","_hoisted_3","install","api","config","SystemWidget"],"mappings":";;;;AAiBA,UAAMA,IAAaC,EAAmB,YAAY;AAClD,QAAI,CAACD;AACH,YAAM,IAAI,MAAM,kCAAkC;AAGpD,UAAME,IAAQC,EAAS;AAAA,MACrB,SAAS;AAAA,MACT,QAAQ;AAAA,MACR,WAAU,oBAAI,KAAA,GAAO,QAAA;AAAA,IAAQ,CAC9B;AAED,QAAIC,IAAkC;AAEtC,IAAAC,EAAU,YAAY;AACpB,UAAI;AACF,QAAAD,IAAe,MAAMJ,EAAW,SAAS;AAAA,UACvC;AAAA,UACA,CAACM,MAAoD;AACnD,YAAIA,EAAQ,OAAO,aAAUJ,EAAM,SAASI,EAAQ,QAChDA,EAAQ,OAAO,eAAYJ,EAAM,WAAWI,EAAQ;AAAA,UAC1D;AAAA,QAAA;AAAA,MAEJ,SAASC,GAAG;AACV,gBAAQ,MAAM,6CAA6CA,CAAC;AAAA,MAC9D;AAAA,IACF,CAAC,GAEDC,EAAY,MAAM;AAChB,MAAAJ,GAAc,QAAA;AAAA,IAChB,CAAC;AAED,UAAMK,IAAWC,EAAS,MAAM;AAC9B,YAAMC,IAAO,IAAI,KAAKT,EAAM,QAAQ,GAC9BU,IAAQD,EAAK,YAAA,EAAc,WAAW,SAAS,GAAG,GAAG,GACrDE,IAAUF,EAAK,cAAA,EAAgB,WAAW,SAAS,GAAG,GAAG,GACzDG,IAAUH,EAAK,cAAA,EAAgB,WAAW,SAAS,GAAG,GAAG;AAC/D,aAAO,GAAGC,CAAK,IAAIC,CAAO,IAAIC,CAAO;AAAA,IACvC,CAAC,GAEKC,IAAaL,EAAS,MACb,IAAI,KAAKR,EAAM,QAAQ,EACxB,mBAAmB,IAAI;AAAA,MACjC,MAAM;AAAA,MACN,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,cAAc;AAAA,IAAA,CACf,CACF;sBAhECc,EAAA,GAAAC,EASM,OATNC,GASM;AAAA,MARJC,EAMM,OAAA;AAAA,QALJ,OAAM;AAAA,QACL,aAASC,EAAA,CAAA,MAAAA,EAAA,CAAA,IAAA,CAAAC,MAAEnB,EAAM,UAAO;AAAA,QACxB,cAAUkB,EAAA,CAAA,MAAAA,EAAA,CAAA,IAAA,CAAAC,MAAEnB,EAAM,UAAO;AAAA,MAAA;QAE1BiB,EAAuE,QAAvEG,GAAuEC,EAA/CrB,EAAM,UAAUa,EAAA,QAAaN,EAAA,KAAQ,GAAA,CAAA;AAAA,MAAA;MAE/DU,EAA2C,QAA3CK,GAA2CD,EAAtBrB,EAAM,MAAM,GAAA,CAAA;AAAA,IAAA;;;;;;;;ACF9B,SAASuB,EAAQC,GAAiBC,GAAuB;AAC9D,EAAAD,EAAI,GAAG,eAAe,iBAAiB,UAAUE,GAAc;AAAA,IAC7D,UAAUD,GAAQ;AAAA,EAAA,CACnB;AACH;"}
+{"version":3,"file":"index.js","sources":["../src/tangram_system/SystemWidget.vue","../src/tangram_system/index.ts"],"sourcesContent":["<template>\n  <div class=\"system-widget\">\n    <div\n      class=\"clock\"\n      @mouseover=\"state.hovered = true\"\n      @mouseleave=\"state.hovered = false\"\n    >\n      <span id=\"info_time\">{{ state.hovered ? local_time : utc_time }}</span>\n    </div>\n    <span id=\"uptime\">{{ state.uptime }}</span>\n  </div>\n</template>\n\n<script setup lang=\"ts\">\nimport { reactive, computed, inject, onMounted, onUnmounted } from \"vue\";\nimport type { TangramApi, Disposable } from \"@open-aviation/tangram-core/api\";\n\nconst tangramApi = inject<TangramApi>(\"tangramApi\");\nif (!tangramApi) {\n  throw new Error(\"assert: tangram api not provided\");\n}\n\nconst state = reactive({\n  hovered: false,\n  uptime: \"\",\n  info_utc: new Date().getTime()\n});\n\nlet subscription: Disposable | null = null;\n\nonMounted(async () => {\n  try {\n    subscription = await tangramApi.realtime.subscribe(\n      \"system:update-node\",\n      (payload: { el: string; value: string | number }) => {\n        if (payload.el === \"uptime\") state.uptime = payload.value as string;\n        if (payload.el === \"info_utc\") state.info_utc = payload.value as number;\n      }\n    );\n  } catch (e) {\n    console.error(\"failed to subscribe to system:update-node\", e);\n  }\n});\n\nonUnmounted(() => {\n  subscription?.dispose();\n});\n\nconst utc_time = computed(() => {\n  const date = new Date(state.info_utc);\n  const hours = date.getUTCHours().toString().padStart(2, \"0\");\n  const minutes = date.getUTCMinutes().toString().padStart(2, \"0\");\n  const seconds = date.getUTCSeconds().toString().padStart(2, \"0\");\n  return `${hours}:${minutes}:${seconds} Z`;\n});\n\nconst local_time = computed(() => {\n  const date = new Date(state.info_utc);\n  return date.toLocaleTimeString([], {\n    hour: \"2-digit\",\n    minute: \"2-digit\",\n    second: \"2-digit\",\n    hour12: false,\n    timeZoneName: \"shortOffset\"\n  });\n});\n</script>\n\n<style scoped>\n#uptime {\n  color: var(--t-muted);\n  font-size: 9pt;\n  text-align: center;\n}\n\n.clock {\n  color: var(--t-fg);\n}\n\n.system-widget {\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  padding: 1px;\n  border-bottom: 1px solid var(--t-border);\n}\n</style>\n","import type { TangramApi } from \"@open-aviation/tangram-core/api\";\nimport SystemWidget from \"./SystemWidget.vue\";\n\ninterface SystemConfig {\n  topbar_order: number;\n}\n\nexport function install(api: TangramApi, config?: SystemConfig) {\n  api.ui.registerWidget(\"system-widget\", \"TopBar\", SystemWidget, {\n    priority: config?.topbar_order\n  });\n}\n"],"names":["tangramApi","inject","state","reactive","subscription","onMounted","payload","e","onUnmounted","utc_time","computed","date","hours","minutes","seconds","local_time","_openBlock","_createElementBlock","_hoisted_1","_createElementVNode","_cache","$event","_hoisted_2","_toDisplayString","_hoisted_3","install","api","config","SystemWidget"],"mappings":";;;;AAiBA,UAAMA,IAAaC,EAAmB,YAAY;AAClD,QAAI,CAACD;AACH,YAAM,IAAI,MAAM,kCAAkC;AAGpD,UAAME,IAAQC,EAAS;AAAA,MACrB,SAAS;AAAA,MACT,QAAQ;AAAA,MACR,WAAU,oBAAI,KAAA,GAAO,QAAA;AAAA,IAAQ,CAC9B;AAED,QAAIC,IAAkC;AAEtC,IAAAC,EAAU,YAAY;AACpB,UAAI;AACF,QAAAD,IAAe,MAAMJ,EAAW,SAAS;AAAA,UACvC;AAAA,UACA,CAACM,MAAoD;AACnD,YAAIA,EAAQ,OAAO,aAAUJ,EAAM,SAASI,EAAQ,QAChDA,EAAQ,OAAO,eAAYJ,EAAM,WAAWI,EAAQ;AAAA,UAC1D;AAAA,QAAA;AAAA,MAEJ,SAASC,GAAG;AACV,gBAAQ,MAAM,6CAA6CA,CAAC;AAAA,MAC9D;AAAA,IACF,CAAC,GAEDC,EAAY,MAAM;AAChB,MAAAJ,GAAc,QAAA;AAAA,IAChB,CAAC;AAED,UAAMK,IAAWC,EAAS,MAAM;AAC9B,YAAMC,IAAO,IAAI,KAAKT,EAAM,QAAQ,GAC9BU,IAAQD,EAAK,YAAA,EAAc,WAAW,SAAS,GAAG,GAAG,GACrDE,IAAUF,EAAK,cAAA,EAAgB,WAAW,SAAS,GAAG,GAAG,GACzDG,IAAUH,EAAK,cAAA,EAAgB,WAAW,SAAS,GAAG,GAAG;AAC/D,aAAO,GAAGC,CAAK,IAAIC,CAAO,IAAIC,CAAO;AAAA,IACvC,CAAC,GAEKC,IAAaL,EAAS,MACb,IAAI,KAAKR,EAAM,QAAQ,EACxB,mBAAmB,IAAI;AAAA,MACjC,MAAM;AAAA,MACN,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,cAAc;AAAA,IAAA,CACf,CACF;sBAhECc,EAAA,GAAAC,EASM,OATNC,GASM;AAAA,MARJC,EAMM,OAAA;AAAA,QALJ,OAAM;AAAA,QACL,aAASC,EAAA,CAAA,MAAAA,EAAA,CAAA,IAAA,CAAAC,MAAEnB,EAAM,UAAO;AAAA,QACxB,cAAUkB,EAAA,CAAA,MAAAA,EAAA,CAAA,IAAA,CAAAC,MAAEnB,EAAM,UAAO;AAAA,MAAA;QAE1BiB,EAAuE,QAAvEG,GAAuEC,EAA/CrB,EAAM,UAAUa,EAAA,QAAaN,EAAA,KAAQ,GAAA,CAAA;AAAA,MAAA;MAE/DU,EAA2C,QAA3CK,GAA2CD,EAAtBrB,EAAM,MAAM,GAAA,CAAA;AAAA,IAAA;;;;;;;;ACF9B,SAASuB,EAAQC,GAAiBC,GAAuB;AAC9D,EAAAD,EAAI,GAAG,eAAe,iBAAiB,UAAUE,GAAc;AAAA,IAC7D,UAAUD,GAAQ;AAAA,EAAA,CACnB;AACH;"}

tangram_system/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-aviation/tangram-system",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "private": true,
   "type": "module",
   "main": "src/tangram_system/index.ts",
@@ -11,6 +11,6 @@
     "@open-aviation/tangram-core": "workspace:*"
   },
   "devDependencies": {
-    "vue": "^3.5.25"
+    "vue": "^3.5.27"
   }
 }

{tangram_system-0.2.1.dist-info → tangram_system-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tangram_system
-Version: 0.2.1
+Version: 0.4.0
 Summary: System monitoring plugin for tangram
 Author-email: Xavier Olive <git@xoolive.org>, Junzi Sun <git@junzis.com>
 License-Expression: AGPL-3.0
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.10
 Requires-Dist: psutil
-Requires-Dist: tangram-core>=0.2.0
+Requires-Dist: tangram-core>=0.2.1
 Description-Content-Type: text/markdown
 
 # tangram_system

tangram_system-0.4.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+tangram_system/SystemWidget.vue,sha256=HnUMBAzgKcMfpSFEt7-4NHBy2WAnw_RXXmk8ozmbmGM,2121
+tangram_system/__init__.py,sha256=o3rNHiJoVBHwz45kGMSPbslq-BM55i6KVq2yMDwF-qs,2432
+tangram_system/index.ts,sha256=COqiA9ro0jHvdtigahKbZ75SoApJtbV24vaakeNVXKI,343
+tangram_system/dist-frontend/index.css,sha256=72FUxkp_PiCXE5A08YqcDMV4Ui_ei42tnkc8v67F7ls,259
+tangram_system/dist-frontend/index.js,sha256=vsiBVDa1khsf7GEZo7imM6MA0daSd3gSl3iN-sVQcyQ,2108
+tangram_system/dist-frontend/index.js.map,sha256=KeooVHix935GDpYmL75Pa1Epup9pPmIz5JFn0JmxEqY,4585
+tangram_system/dist-frontend/plugin.json,sha256=f9ITIfSjnW0OhcoQa6pp3HgxSLxDszLCLiZ6H2coz9A,91
+tangram_system/package.json,sha256=i1xo6RoeEYi8dWBe6RqjZh3nbmiFGis1lVOq3YvLrcY,316
+tangram_system-0.4.0.dist-info/METADATA,sha256=JYtWjrlvsilCiTB7qEW_vlXqmGc7x0LPrYxWyGOyO0g,1478
+tangram_system-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tangram_system-0.4.0.dist-info/entry_points.txt,sha256=lC7Uu8HPLHLg2ULa0lh2SWTN2qt_LrPFUrcqVL4heZk,62
+tangram_system-0.4.0.dist-info/RECORD,,

tangram_system-0.2.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-tangram_system/SystemWidget.vue,sha256=A1eZIibTmmrCyPdmqtcJi60dArSg4qYw6Mn76Iw2rgE,2069
-tangram_system/__init__.py,sha256=CJqn9VUAirPI8jOXCI1Lk3GR9FIgNhGF6if5yfsR3Wk,2245
-tangram_system/index.ts,sha256=COqiA9ro0jHvdtigahKbZ75SoApJtbV24vaakeNVXKI,343
-tangram_system/dist-frontend/index.css,sha256=Ck5orxty4qPRwI417S1V8NU7Xw606jMQZqdSf0bqgmk,199
-tangram_system/dist-frontend/index.js,sha256=4d3jbhcLv9pwDophIF8UvD6Z8Si3wtTcV5HIh_sEKKk,2108
-tangram_system/dist-frontend/index.js.map,sha256=8HSWZ_rCKEyo8HsqiPCqbGbCyAxvqDTTGjXOmp3R0nw,4529
-tangram_system/dist-frontend/plugin.json,sha256=f9ITIfSjnW0OhcoQa6pp3HgxSLxDszLCLiZ6H2coz9A,91
-tangram_system/package.json,sha256=zT1MUNUIYT1SqAtG8Kq70Gb9To8xT2kHIV4EwoB2MnM,316
-tangram_system-0.2.1.dist-info/METADATA,sha256=m3IlhvIETh0ns9gBzD8VUWCc7AUjQh-tg6IDdJ0Jz1I,1478
-tangram_system-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tangram_system-0.2.1.dist-info/entry_points.txt,sha256=lC7Uu8HPLHLg2ULa0lh2SWTN2qt_LrPFUrcqVL4heZk,62
-tangram_system-0.2.1.dist-info/RECORD,,