Merge branch 'OSCQuery' into develop

models/osc/osc_tools.py

@@ -1,8 +1,11 @@
 from time import sleep
+import threading
 from pythonosc import osc_message_builder
 from pythonosc import udp_client
 from pythonosc import dispatcher
 from pythonosc import osc_server
+from tinyoscquery.queryservice import OSCQueryService
+from tinyoscquery.utility  import get_open_udp_port, get_open_tcp_port
 
 # send OSC message typing
 def sendTyping(flag=False, ip_address="127.0.0.1", port=9000):
@@ -45,12 +48,40 @@ def sendChangeVoice(ip_address="127.0.0.1", port=9000):
     sendInputVoice(flag=0, ip_address=ip_address, port=port)
     sleep(0.05)
 
-def receiveOscParameters(target, filter="/*", ip_address="127.0.0.1", port=9001):
-    _dispatcher = dispatcher.Dispatcher()
-    _dispatcher.map(filter, target)
-    server = osc_server.ThreadingOSCUDPServer((ip_address, port), _dispatcher)
-    return server
+
+def receiveOscParameters(dict_filter_and_target, ip_address="127.0.0.1", title="VRCT"):
+    osc_port = get_open_udp_port()
+    http_port = get_open_tcp_port()
+    osc_dispatcher = dispatcher.Dispatcher()
+    for filter, target in dict_filter_and_target.items():
+        osc_dispatcher.map(filter, target)
+
+    osc_udp_server = osc_server.ThreadingOSCUDPServer((ip_address, osc_port), osc_dispatcher)
+    threading.Thread(target=osc_udp_server.serve_forever, daemon = True).start()
+
+    osc_client = OSCQueryService(title, http_port, osc_port)
+    for filter, target in dict_filter_and_target.items():
+        osc_client.advertise_endpoint(filter)
 
 if __name__ == "__main__":
-    sendChangeVoice()
-    sendChangeVoice()
+    osc_parameter_prefix = "/avatar/parameters/"
+    osc_avatar_change_path = "/avatar/change"
+    param_MuteSelf = "MuteSelf"
+    param_Voice = "Voice"
+
+    def print_handler_all(address, *args):
+        print(f"all {address}: {args}")
+
+    def print_handler_muteself(address, *args):
+        print(f"muteself {address}: {args}")
+
+    def print_handler_voice(address, *args):
+        print(f"voice {address}: {args}")
+
+    dict_filter_and_target = {
+        # osc_parameter_prefix + "*": print_handler_all,
+        osc_parameter_prefix + param_MuteSelf: print_handler_muteself,
+        osc_parameter_prefix + param_Voice: print_handler_voice,
+    }
+
+    receiveOscParameters(dict_filter_and_target)

requirements.txt

@@ -14,3 +14,4 @@ ctranslate2==3.24.0
 faster-whisper==0.10.0
 translators @ git+https://github.com/misyaguziya/translators@master
 SpeechRecognition @ git+https://github.com/misyaguziya/custom_speech_recognition@master
+tinyoscquery @ git+https://github.com/cyberkitsune/tinyoscquery@0.1.2