Browse Source

move udp and tailscale into their own modules

Alex Cheema 7 months ago
parent
commit
073b3ffce8

+ 2 - 2
exo/networking/tailscale_discovery.py → exo/networking/tailscale/tailscale_discovery.py

@@ -3,8 +3,8 @@ import time
 import traceback
 from typing import List, Dict, Callable, Tuple
 from tailscale import Tailscale, Device
-from .discovery import Discovery
-from .peer_handle import PeerHandle
+from exo.networking.discovery import Discovery
+from exo.networking.peer_handle import PeerHandle
 from exo.topology.device_capabilities import DeviceCapabilities, device_capabilities, UNKNOWN_DEVICE_CAPABILITIES
 from exo.helpers import DEBUG, DEBUG_DISCOVERY
 from .tailscale_helpers import get_device_id, update_device_attributes, get_device_attributes, update_device_attributes

+ 0 - 0
exo/networking/tailscale_helpers.py → exo/networking/tailscale/tailscale_helpers.py


+ 1 - 1
exo/networking/test_tailscale_discovery.py → exo/networking/tailscale/test_tailscale_discovery.py

@@ -2,7 +2,7 @@ import os
 import asyncio
 import unittest
 from unittest import mock
-from exo.networking.tailscale_discovery import TailscaleDiscovery
+from exo.networking.tailscale.tailscale_discovery import TailscaleDiscovery
 from exo.networking.peer_handle import PeerHandle
 
 class TestTailscaleDiscovery(unittest.IsolatedAsyncioTestCase):

+ 1 - 1
exo/networking/test_udp_discovery.py → exo/networking/udp/test_udp_discovery.py

@@ -1,7 +1,7 @@
 import asyncio
 import unittest
 from unittest import mock
-from exo.networking.udp_discovery import UDPDiscovery
+from exo.networking.udp.udp_discovery import UDPDiscovery
 from exo.networking.grpc.grpc_peer_handle import GRPCPeerHandle
 from exo.networking.grpc.grpc_server import GRPCServer
 from exo.orchestration.node import Node

+ 2 - 2
exo/networking/udp_discovery.py → exo/networking/udp/udp_discovery.py

@@ -4,8 +4,8 @@ import socket
 import time
 import traceback
 from typing import List, Dict, Callable, Tuple, Coroutine
-from .discovery import Discovery
-from .peer_handle import PeerHandle
+from exo.networking.discovery import Discovery
+from exo.networking.peer_handle import PeerHandle
 from exo.topology.device_capabilities import DeviceCapabilities, device_capabilities, UNKNOWN_DEVICE_CAPABILITIES
 from exo.helpers import DEBUG, DEBUG_DISCOVERY, get_all_ip_addresses
 

+ 2 - 2
main.py

@@ -7,8 +7,8 @@ import traceback
 import uuid
 from exo.orchestration.standard_node import StandardNode
 from exo.networking.grpc.grpc_server import GRPCServer
-from exo.networking.udp_discovery import UDPDiscovery
-from exo.networking.tailscale_discovery import TailscaleDiscovery
+from exo.networking.udp.udp_discovery import UDPDiscovery
+from exo.networking.tailscale.tailscale_discovery import TailscaleDiscovery
 from exo.networking.grpc.grpc_peer_handle import GRPCPeerHandle
 from exo.topology.ring_memory_weighted_partitioning_strategy import RingMemoryWeightedPartitioningStrategy
 from exo.api import ChatGPTAPI