syndesi 0.3.2__py3-none-any.whl → 0.4.1__py3-none-any.whl

syndesi/tools/backend_api.py

@@ -24,28 +24,27 @@ default_host = LOCALHOST
 
 # The backend links the client with an adapter when SELECT_ADAPTER is sent along with an adapter descriptor
 
-STANDARD_RESPONSE_TIMEOUT = 2
-
+EXTRA_BUFFER_RESPONSE_TIME = 1
 
 class Action(Enum):
     # All adapters
     SELECT_ADAPTER = "select"
     OPEN = "open"  # (descriptor,stop_condition) -> ()
-    CLOSE = (
-        "close"  # (descriptor,) -> () # Notify the backend that this client will close
-    )
-    FORCE_CLOSE = "force_close"  # (descriptor,) -> ()
+    CLOSE = "close"  # (descriptor,force) -> () 
+    #FORCE_CLOSE = "force_close"  # (descriptor,) -> ()
     WRITE = "write"  # (descriptor,data) -> ()
     READ = "read"  # (descriptor,full_output,temporary_timeout,temporary_stop_condition) -> (data,metrics)
-    SET_STOP_CONDITION = "set_stop_condition"  # (descriptor,stop_condition)
+    SET_STOP_CONDITIONs = "set_stop_condition"  # (descriptor,stop_condition)
     FLUSHREAD = "flushread"
-    #START_READ = "start_read"  # Start a read (descriptor,response_time)
-    GET_BACKEND_TIME = "get_time"
+    START_READ = "start_read"  # Start a read (descriptor,response_time)
+    RESPONSE_TIMEOUT = "response_timeout"
+    #GET_BACKEND_TIME = "get_time"
 
-    # Events
-    ADAPTER_EVENT_DATA_READY = "event_adapter_data_ready"
-    ADAPTER_EVENT_DISCONNECTED = "event_adapter_disconnected"
-    ADAPTER_EVENT_READ_INIT = "event_adapter_read_init"
+    # Signal
+    ADAPTER_SIGNAL = "adapter_signal"
+    #ADAPTER_EVENT_DATA_READY = "event_adapter_data_ready"
+    #ADAPTER_EVENT_DISCONNECTED = "event_adapter_disconnected"
+    #ADAPTER_EVENT_READ_INIT = "event_adapter_read_init"
 
     # Other
     SET_ROLE_ADAPTER = (
@@ -73,8 +72,8 @@ class Action(Enum):
     ERROR_FAILED_TO_OPEN = "error_failed_to_open"
 
 
-def is_event(action: Action) -> bool:
-    return action.value.startswith("event_")
+# def is_event(action: Action) -> bool:
+#     return action.value.startswith("event_")
 
 
 def is_action_error(action: Action) -> bool:
@@ -138,7 +137,7 @@ def backend_request(
     conn: Connection,
     action: Action,
     *args: Any,
-    timeout: float = STANDARD_RESPONSE_TIMEOUT,
+    timeout: float = EXTRA_BUFFER_RESPONSE_TIME,
 ) -> BackendResponse:
     try:
         conn.send((action.value, *args))

syndesi/tools/errors.py

@@ -2,6 +2,9 @@
 # Author : Sébastien Deriaz
 # License : GPL
 
+from pathlib import Path
+
+PACKAGE_PATH = Path(__file__).resolve().parent.parent
 
 class SyndesiError(Exception):
     """Base class for all Syndesi errors"""
@@ -21,3 +24,28 @@ class AdapterBackendError(BackendError):
 
 class AdapterError(SyndesiError):
     """Error inside an adapter frontend"""
+
+
+def make_error_description(e : Exception) -> str: 
+    tb = e.__traceback__
+    if tb is None:
+        error_message = ""
+    else:
+        while True:
+            if tb.tb_next is None:
+                break
+            file = Path(tb.tb_next.tb_frame.f_code.co_filename).resolve()
+            if not file.is_relative_to(PACKAGE_PATH):
+                break
+            tb = tb.tb_next
+
+        _type = type(e)
+        extra_arguments = (str(e),)
+        frame = tb.tb_frame
+        line_no = tb.tb_lineno
+        filename = frame.f_code.co_filename
+        error_message = (
+            f"{_type} : {extra_arguments} {filename}:{line_no}"
+        )
+
+    return error_message

syndesi/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.3.2"
+__version__ = "0.4.1"
 NAME = "Syndesi"
 AUTHOR = "Sébastien Deriaz"

{syndesi-0.3.2.dist-info → syndesi-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syndesi
-Version: 0.3.2
+Version: 0.4.1
 Summary: Syndesi
 Author-email: Sébastien Deriaz <sebastien.deriaz1@gmail.com>
 License: GPL
@@ -17,6 +17,7 @@ License-File: LICENSE
 Requires-Dist: prompt_toolkit
 Requires-Dist: pyserial
 Requires-Dist: rich
+Requires-Dist: platformdirs
 Dynamic: license-file
 
 # Syndesi Python Implementation

{syndesi-0.3.2.dist-info → syndesi-0.4.1.dist-info}/RECORD

@@ -1,59 +1,59 @@
 syndesi/__init__.py,sha256=FjPBCp-hgUfpzbl9vvNVybvP3Ml8toibnew9kZH2cQw,360
 syndesi/__main__.py,sha256=S9G9k0SHGJJ9qMdF_txtYryiPdEPTI10bgQ-M-rVITs,75
-syndesi/version.py,sha256=VTTdTopY1qtr_tEUiyP6-8v4HC8Kq_js4-T5UUdIgYw,68
+syndesi/version.py,sha256=QtuM82B6eYOf3QWKLl_-fN_VKqrn8cvKRV7h6wJk9qc,68
 syndesi/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syndesi/adapters/adapter.py,sha256=blMQ-6AjVAFkwwYpIh5wHrNo3qBAD9rFTQ5V236R4vc,22771
-syndesi/adapters/auto.py,sha256=L9dgiNkGRnBG4_ErwfX13MEp4JF2agXz7eg9O2-aPPA,1586
-syndesi/adapters/ip.py,sha256=oerOwEcaM5luS-Z3e40YPUJpCbUTtl3a1CuVfg1Vy3M,3518
+syndesi/adapters/adapter.py,sha256=8GzXsg9J8PuPywhnLfEq5Hhae80QLLiYArLbGpHRy_Y,21147
+syndesi/adapters/auto.py,sha256=SSNlo_EpjWJIqjpSyYPOYBKowVsd1TlaS8_-nng-Bp4,1592
+syndesi/adapters/ip.py,sha256=s-TRHwgyVG-FYxDWB2W1qVwmjox00XL3RyUrOoRJEeQ,3392
 syndesi/adapters/ip_server.py,sha256=8o0cPRxAjnzTvwTCADy6MaNCDc5Uk0NDMXo0sZXoYCY,3773
-syndesi/adapters/serialport.py,sha256=rpxkGqM0otaPdQ4-lA_swDpoMJNJyPfFAJOOlpZqW0A,2367
-syndesi/adapters/stop_condition.py,sha256=5ysg9xmH2pgXgJXuOeEjtg5dD_phcQEFZQGjMn-uKew,3936
-syndesi/adapters/timeout.py,sha256=q7ZxhkZ9ETWn4ROgwbMjPt4qt8XhuHrYBnCAoTyANSE,3164
-syndesi/adapters/visa.py,sha256=G50ih0klh984nNLLch9SxgoC1oP72nMjTjZlPwk-niw,1389
+syndesi/adapters/serialport.py,sha256=GeMVfwqgpTL0mR0LfI--4M80EwSg4zvjj03FIGh-x9g,2362
+syndesi/adapters/stop_condition.py,sha256=1mMPpwv1oYSaPV83Avgn0LVuijdhlB-eSqlC38rgJ9o,4495
+syndesi/adapters/timeout.py,sha256=XS-dPZEdR4hS1DzQQUKO2fqNd65SuFLHdc1oSG8yFH0,3179
+syndesi/adapters/visa.py,sha256=dbszb9qFaPc3iiFh8KQV2bQK-QrwTcCUA36yPip4dkU,1406
 syndesi/adapters/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syndesi/adapters/backend/adapter_backend.py,sha256=r2hfPeaUNJwwU3GBIiqdN_uxb2w_9RcS1lfTSCXnvn8,12795
+syndesi/adapters/backend/adapter_backend.py,sha256=JX19P7LXI1ywyLzsYY0qCZ0ZVDjUHhp143zEWNg08hk,13894
 syndesi/adapters/backend/adapter_manager.py,sha256=8t_4D3WGtkvdF5RdnFiBJASD3_xny5eBxP8ZQI5BmgM,1938
-syndesi/adapters/backend/adapter_session.py,sha256=DBYpc_K8t74I2Lex8aMKaq4yWDtA16iZOgfFgCXzAvg,18520
+syndesi/adapters/backend/adapter_session.py,sha256=IhhhtJiBQdMKZWCQjwv9Ko98uqKlm_gW1Jb-MW4eFo0,14149
 syndesi/adapters/backend/backend.py,sha256=yoEYW9wnkii8b6TkiQNz_iRLjB8kdhzZG3Ky1dcycxI,15862
 syndesi/adapters/backend/backend_tools.py,sha256=fkl4_lgW9QKb1fTiC9LvkI88g4SD9K9rxS3qMVc_0FA,1893
-syndesi/adapters/backend/descriptors.py,sha256=kJVVfnbH1CzJ7T2lhMXRADCABfXkPVJpM-541Iw-98k,4273
-syndesi/adapters/backend/ip_backend.py,sha256=XCAkaLXtvGUl8NnG6gco2pEL7a8NyCfbuq8IK7csDu4,5061
-syndesi/adapters/backend/serialport_backend.py,sha256=mT0ZPbL9kHRfhMap2aAUKvgLFeAUiTnXRPdSRdoLw4g,8087
-syndesi/adapters/backend/stop_condition_backend.py,sha256=BWPyq8u9C6uGym7oDS4DQEIW0O_kW3YyCpviVgfx-G0,11375
+syndesi/adapters/backend/descriptors.py,sha256=jG-r-71e5H5sZb8mshNbHbpdLKAzdwa8xW3PqyGJCoI,4299
+syndesi/adapters/backend/ip_backend.py,sha256=KCUacNyZAAYmDKm8ght6ssoYYRvIxg2eV-J9OdsiPtg,5122
+syndesi/adapters/backend/serialport_backend.py,sha256=YzUcuTbXP_pHhwLOG1EbRVG9q6Wy4PLn8psAkiLPdiQ,8463
+syndesi/adapters/backend/stop_condition_backend.py,sha256=102ObiC30khJu85Y4Hn3xodN7HExkJrT9PzS2YywYRM,6995
 syndesi/adapters/backend/timed_queue.py,sha256=CwE3PklJqwwwbjyVvdEXIHXAIMwQSGPeBX3O_Kk4wH8,1163
 syndesi/adapters/backend/timeout.py,sha256=thWUajfgvasPLptf0n5TvWLEjp3F2k0s3EAbAICpdvU,10480
-syndesi/adapters/backend/visa_backend.py,sha256=apn6GjCpfDKcACDKpPDP1r9zpUj0PHWn_2lhvwy1C6w,6455
+syndesi/adapters/backend/visa_backend.py,sha256=Roty2XkF1sMfI0fDSqh4drAiRXIyG8uIOTKe5dEnXrk,6350
 syndesi/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syndesi/cli/backend_console.py,sha256=9INqGf2EtnuCxFYWZbNCJ3exrx6k04uCh6jno8sUQTw,2971
 syndesi/cli/backend_status.py,sha256=uD-IS0RcPsWGaKCue0sR-_aTy3cytipSk4C0Rl7w4AY,11908
 syndesi/cli/backend_wrapper.py,sha256=dbBZs0NaWh2OiV3eh_D6_njfkPj_vYGJsY_SSY7QaCI,1900
 syndesi/cli/console.py,sha256=eNxp7XxE30pVJUNRWwbmtSE6XIrFzWvdWuwieNiO_d0,10417
 syndesi/cli/shell.py,sha256=iM05uHyslASz_fBROwiapJPHgWde5EPQTPlgJ34ATfs,7786
-syndesi/cli/shell_tools.py,sha256=f4m9l2RRofu8arqWCewK9ipvadi6OOd6O2EEykOV7N4,3295
+syndesi/cli/shell_tools.py,sha256=YGPeB1Le4exvtrcLOaKnpDrAlSosztvW4AkChvBLm4E,3455
 syndesi/cli/terminal.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syndesi/cli/terminal_apps.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syndesi/cli/terminal_tools.py,sha256=VsqN-i7MM29Vo0gIUqFmgTyvMRBkcNuw6H3M4jJ4b4o,285
 syndesi/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syndesi/protocols/delimited.py,sha256=tPaSpaYoHj0hSnI55kN1TS60WXnH90rkE517Qdt3d94,7210
-syndesi/protocols/modbus.py,sha256=11RwTaj7u-DQB58OhgMnzG8ROMTya98dHoPfdEJPx7A,52816
+syndesi/protocols/delimited.py,sha256=NxrK77eAkXFTVEq8-5DfKPjKiYSS51JtQOFZF5dabx8,6992
+syndesi/protocols/modbus.py,sha256=SrQFVJU5Mmx0Gt3UiQlZoQMtNTZ63GiKDHS-LJMMT9E,52981
 syndesi/protocols/protocol.py,sha256=r4Hdc5UvR3oYsFW7NYiOYQBG-K0MPEJGHygK3jlp4pI,2263
-syndesi/protocols/raw.py,sha256=eCuHlBYO-SSELFugwWuaNyFkbDL2TH9TA9xblTcLuxk,2522
-syndesi/protocols/scpi.py,sha256=kUEvCf9h-1GMT_EwG4Q5rKe93i8ruUvXyrsND0sxyB8,4699
+syndesi/protocols/raw.py,sha256=BgpYykw2Bp-RGnbRGbQVgf5NEveXh1UPDn4PoMn2P7o,2759
+syndesi/protocols/scpi.py,sha256=XmjYn3NnaUNKWBpVmDDvwWy1AYz7XZtm-pYuR47eHwg,4801
 syndesi/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syndesi/scripts/syndesi.py,sha256=sCY14-_YUG27PjteGDPWboS2nO092qpfGpdfU0Rulj4,1386
 syndesi/scripts/syndesi_backend.py,sha256=wrJt-_ciuKumOgbcNTcpNGQj7XN_toJ_Mp_IjdA5TZA,914
 syndesi/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syndesi/tools/backend_api.py,sha256=T6cHmkRgIsrjpmDIeJgbW1vtbQd5w91DYIQcLQuMDYo,6262
+syndesi/tools/backend_api.py,sha256=xVujKez8a9cF-9yC_uHhhNazIzA3SwVZDuaqpHvOFpE,6293
 syndesi/tools/backend_logger.py,sha256=dpST6jKQz7bq58C-JLLpawZZPie1EcW9vKvsS8L1CFA,2300
-syndesi/tools/errors.py,sha256=sSNgXjNFofc3ExlJEni4pSvCqZBs9ZGrJbHc6Hr1N8A,468
+syndesi/tools/errors.py,sha256=ZUS6wRnZlP3Lzw9uA8goU0a_h4DIs-qClm_dkTUCY9s,1226
 syndesi/tools/exceptions.py,sha256=4zWJFMpNgVHMW91zFX-CafVhBFuP-P8h5tgvHlQMWw4,372
 syndesi/tools/internal.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syndesi/tools/log.py,sha256=k_L3kMm4r_Vxfw1B7znGXRxsMc_Fo37t5Ky6yZxmE_o,7686
 syndesi/tools/log_settings.py,sha256=CEshxSpIZeVu1BUhy-l1Fel1PY_hxb5ywsYQs9UEUVQ,382
 syndesi/tools/types.py,sha256=7k3rbKZCxSDNA6T1p3sS6TvEclV1HCDeWCW8ymBN0Vo,2498
-syndesi-0.3.2.dist-info/licenses/LICENSE,sha256=7oldAMqsditrYeX4dzMFHpFZ-6AkyGi3bha2zeaJB0A,34492
-syndesi-0.3.2.dist-info/METADATA,sha256=REZvkezzZgsk5nk3kcDS7K-UYcWwUW4SF6snUT1XotE,5073
-syndesi-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-syndesi-0.3.2.dist-info/entry_points.txt,sha256=1JbZYMX6PrakEg-6b_M_f58QJ1mGFJKJd7puoPQPyKM,112
-syndesi-0.3.2.dist-info/top_level.txt,sha256=HrY36JU6hFYp_6qv-GuVBBtHYYemn8qhCrqpvXBd1Lg,8
-syndesi-0.3.2.dist-info/RECORD,,
+syndesi-0.4.1.dist-info/licenses/LICENSE,sha256=7oldAMqsditrYeX4dzMFHpFZ-6AkyGi3bha2zeaJB0A,34492
+syndesi-0.4.1.dist-info/METADATA,sha256=XXstLwl8AU6NG0PhjVWd0D59gaLUple_WuurTegIE8Q,5101
+syndesi-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+syndesi-0.4.1.dist-info/entry_points.txt,sha256=1JbZYMX6PrakEg-6b_M_f58QJ1mGFJKJd7puoPQPyKM,112
+syndesi-0.4.1.dist-info/top_level.txt,sha256=HrY36JU6hFYp_6qv-GuVBBtHYYemn8qhCrqpvXBd1Lg,8
+syndesi-0.4.1.dist-info/RECORD,,