diff --git a/components/__init__.py b/components/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/components/event_store/event_logger.py b/components/event_store/event_logger.py index fe41eac..ed284fa 100644 --- a/components/event_store/event_logger.py +++ b/components/event_store/event_logger.py @@ -1,7 +1,7 @@ import pickle from flask_redis import Redis -from shared.message_broker_wrapper import MBWrapper +from dse_shared_libs.message_broker_wrapper import MBWrapper class EventLogger: diff --git a/components/event_store/event_store_server.py b/components/event_store/event_store_server.py index 13c5ddd..1c815db 100644 --- a/components/event_store/event_store_server.py +++ b/components/event_store/event_store_server.py @@ -1,6 +1,6 @@ import threading -from event_store.event_logger import EventLogger +from event_logger import EventLogger from flask import Flask from flask_redis import Redis diff --git a/components/i_feed/traffic_light.py b/components/i_feed/traffic_light.py index a7ab929..3506244 100644 --- a/components/i_feed/traffic_light.py +++ b/components/i_feed/traffic_light.py @@ -6,10 +6,9 @@ from datetime import datetime from circuitbreaker import circuit # Default switching time in seconds -from shared import traffic_light_color -from shared.traffic_light_color import TrafficLightColor -from shared.message_broker_wrapper import MBWrapper -from shared.traffic_light_state import TrafficLightState +from dse_shared_libs.traffic_light_color import TrafficLightColor +from dse_shared_libs.message_broker_wrapper import MBWrapper +from dse_shared_libs.traffic_light_state import TrafficLightState SWITCHING_TIME = 500 # Scale speed of switching by factor x diff --git a/components/i_feed/vehicle.py b/components/i_feed/vehicle.py index da2c216..24eb9d9 100644 --- a/components/i_feed/vehicle.py +++ b/components/i_feed/vehicle.py @@ -7,12 +7,12 @@ from typing import Union import geopy import geopy.distance from circuitbreaker import circuit -from shared.daf import DAF +from dse_shared_libs.daf import DAF -from shared.message_broker_wrapper import MBWrapper +from dse_shared_libs.message_broker_wrapper import MBWrapper # Lat, Long -from shared.target_velocity import TargetVelocity +from dse_shared_libs.target_velocity import TargetVelocity STARTING_POINT = geopy.Point(48.853, 2.349) # in km/h diff --git a/components/orchestration/orchestrator.py b/components/orchestration/orchestrator.py index f33468d..d377503 100644 --- a/components/orchestration/orchestrator.py +++ b/components/orchestration/orchestrator.py @@ -3,13 +3,13 @@ import sys from random import randrange from typing import List, Dict -from shared import daf -from shared.traffic_light_color import TrafficLightColor -from shared.message_broker_wrapper import MBWrapper +from dse_shared_libs import daf +from dse_shared_libs.traffic_light_color import TrafficLightColor +from dse_shared_libs.message_broker_wrapper import MBWrapper # necessary to unpickle daf object -from shared.target_velocity import TargetVelocity -from shared.traffic_light_state import TrafficLightState +from dse_shared_libs.target_velocity import TargetVelocity +from dse_shared_libs.traffic_light_state import TrafficLightState sys.modules['daf'] = daf diff --git a/components/shared/RADME.md b/components/shared/RADME.md new file mode 100644 index 0000000..431db19 --- /dev/null +++ b/components/shared/RADME.md @@ -0,0 +1,5 @@ +Install shared libs via +* To have life changes: `python setup.py develop` +* To install properly: `python setup.py install` + +Create installable package via `python setup.py sdist` diff --git a/components/shared/__init__.py b/components/shared/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/components/shared/dist/dse-shared-libs-1.tar.gz b/components/shared/dist/dse-shared-libs-1.tar.gz new file mode 100644 index 0000000..0aa7ed1 Binary files /dev/null and b/components/shared/dist/dse-shared-libs-1.tar.gz differ diff --git a/components/shared/dist/dse_shared_libs-1-py3.8.egg b/components/shared/dist/dse_shared_libs-1-py3.8.egg new file mode 100644 index 0000000..a0ad676 Binary files /dev/null and b/components/shared/dist/dse_shared_libs-1-py3.8.egg differ diff --git a/components/shared/dse_shared_libs.egg-info/PKG-INFO b/components/shared/dse_shared_libs.egg-info/PKG-INFO new file mode 100644 index 0000000..3646786 --- /dev/null +++ b/components/shared/dse_shared_libs.egg-info/PKG-INFO @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: dse-shared-libs +Version: 1 +Summary: UNKNOWN +Home-page: UNKNOWN +Author: UNKNOWN +Author-email: UNKNOWN +License: BSD License +Description: UNKNOWN +Platform: UNKNOWN diff --git a/components/shared/dse_shared_libs.egg-info/SOURCES.txt b/components/shared/dse_shared_libs.egg-info/SOURCES.txt new file mode 100644 index 0000000..9ebdc52 --- /dev/null +++ b/components/shared/dse_shared_libs.egg-info/SOURCES.txt @@ -0,0 +1,11 @@ +setup.py +dse_shared_libs/__init__.py +dse_shared_libs/daf.py +dse_shared_libs/message_broker_wrapper.py +dse_shared_libs/target_velocity.py +dse_shared_libs/traffic_light_color.py +dse_shared_libs/traffic_light_state.py +dse_shared_libs.egg-info/PKG-INFO +dse_shared_libs.egg-info/SOURCES.txt +dse_shared_libs.egg-info/dependency_links.txt +dse_shared_libs.egg-info/top_level.txt \ No newline at end of file diff --git a/components/shared/dse_shared_libs.egg-info/dependency_links.txt b/components/shared/dse_shared_libs.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/components/shared/dse_shared_libs.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/components/shared/dse_shared_libs.egg-info/top_level.txt b/components/shared/dse_shared_libs.egg-info/top_level.txt new file mode 100644 index 0000000..115e01d --- /dev/null +++ b/components/shared/dse_shared_libs.egg-info/top_level.txt @@ -0,0 +1 @@ +dse_shared_libs diff --git a/components/shared/dse_shared_libs/__init__.py b/components/shared/dse_shared_libs/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/components/shared/daf.py b/components/shared/dse_shared_libs/daf.py similarity index 100% rename from components/shared/daf.py rename to components/shared/dse_shared_libs/daf.py diff --git a/components/shared/message_broker_wrapper.py b/components/shared/dse_shared_libs/message_broker_wrapper.py similarity index 100% rename from components/shared/message_broker_wrapper.py rename to components/shared/dse_shared_libs/message_broker_wrapper.py diff --git a/components/shared/target_velocity.py b/components/shared/dse_shared_libs/target_velocity.py similarity index 100% rename from components/shared/target_velocity.py rename to components/shared/dse_shared_libs/target_velocity.py diff --git a/components/shared/traffic_light_color.py b/components/shared/dse_shared_libs/traffic_light_color.py similarity index 100% rename from components/shared/traffic_light_color.py rename to components/shared/dse_shared_libs/traffic_light_color.py diff --git a/components/shared/traffic_light_state.py b/components/shared/dse_shared_libs/traffic_light_state.py similarity index 72% rename from components/shared/traffic_light_state.py rename to components/shared/dse_shared_libs/traffic_light_state.py index 19740d1..c1422b3 100644 --- a/components/shared/traffic_light_state.py +++ b/components/shared/dse_shared_libs/traffic_light_state.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from datetime import datetime -from shared.traffic_light_color import TrafficLightColor +from dse_shared_libs.traffic_light_color import TrafficLightColor @dataclass diff --git a/components/shared/setup.py b/components/shared/setup.py new file mode 100644 index 0000000..7016dbe --- /dev/null +++ b/components/shared/setup.py @@ -0,0 +1,8 @@ +from setuptools import find_packages, setup + +setup(name='dse-shared-libs', + version=1, + packages=find_packages(), + include_package_data=True, + license='BSD License', # example license + )