From 73174858d6a8f5b0aebd17f5deeb0e90ffc89a9c Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Thu, 27 May 2021 19:53:41 +0200 Subject: [PATCH] use installable shared lib for shared code --- components/__init__.py | 0 components/event_store/event_logger.py | 2 +- components/event_store/event_store_server.py | 2 +- components/i_feed/traffic_light.py | 7 +++---- components/i_feed/vehicle.py | 6 +++--- components/orchestration/orchestrator.py | 10 +++++----- components/shared/RADME.md | 5 +++++ components/shared/__init__.py | 0 components/shared/dist/dse-shared-libs-1.tar.gz | Bin 0 -> 2447 bytes .../shared/dist/dse_shared_libs-1-py3.8.egg | Bin 0 -> 840 bytes .../shared/dse_shared_libs.egg-info/PKG-INFO | 10 ++++++++++ .../shared/dse_shared_libs.egg-info/SOURCES.txt | 11 +++++++++++ .../dependency_links.txt | 1 + .../dse_shared_libs.egg-info/top_level.txt | 1 + components/shared/dse_shared_libs/__init__.py | 0 components/shared/{ => dse_shared_libs}/daf.py | 0 .../message_broker_wrapper.py | 0 .../{ => dse_shared_libs}/target_velocity.py | 0 .../{ => dse_shared_libs}/traffic_light_color.py | 0 .../{ => dse_shared_libs}/traffic_light_state.py | 2 +- components/shared/setup.py | 8 ++++++++ 21 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 components/__init__.py create mode 100644 components/shared/RADME.md create mode 100644 components/shared/__init__.py create mode 100644 components/shared/dist/dse-shared-libs-1.tar.gz create mode 100644 components/shared/dist/dse_shared_libs-1-py3.8.egg create mode 100644 components/shared/dse_shared_libs.egg-info/PKG-INFO create mode 100644 components/shared/dse_shared_libs.egg-info/SOURCES.txt create mode 100644 components/shared/dse_shared_libs.egg-info/dependency_links.txt create mode 100644 components/shared/dse_shared_libs.egg-info/top_level.txt create mode 100644 components/shared/dse_shared_libs/__init__.py rename components/shared/{ => dse_shared_libs}/daf.py (100%) rename components/shared/{ => dse_shared_libs}/message_broker_wrapper.py (100%) rename components/shared/{ => dse_shared_libs}/target_velocity.py (100%) rename components/shared/{ => dse_shared_libs}/traffic_light_color.py (100%) rename components/shared/{ => dse_shared_libs}/traffic_light_state.py (72%) create mode 100644 components/shared/setup.py 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 0000000000000000000000000000000000000000..0aa7ed116a35394fe0f2bc4deda9085d59b4bb87 GIT binary patch literal 2447 zcmZ{k`9Bl>1IHsoiiD8lOp&=ujEo##qCV2r2)PX*#H5%rx5<6wrbf+Cp~T$hFv*e9 z9N{CfIkK(I-rvvT^Zohzdj12i=j(@;bP6wT+t+$$PT=kx{LsNY*aH%batZQqhurse z4Tfl_K6D8>^vm&j@YgFR_wC?pK_tcKQ!X*%b8K?$?Mqp+C0`0921M5a2WyZg_$)5i zD&%qb`PQtKj{1Sw%e#0kEg|i2 zRY1wNe5rxp(;BqdmjLiWJpZ4hhC zCX*(Zn0hu?$}3F=k0SS11Ak%E#qYlZc>k$Q!dES4){DvmL*0XZt`J<=fHYEMw^Lf^ z+N7Z5+QTlhs+uziX`+)Z%bIp7sJCaH(bfpX1V&ioEL|7bu$(c5RN5RcA;zL03;B=> zG|MhRPy$1v>Pg5Wxjcj=%< z_E@L&TO36g$o3*+n~y!(zOoM*821QX_E!MYpGD9`(tzW?E}o-6@IzrbUitvD2>gne z4ztatR7+9pmM!r5YAaVUCoQuXJCLJ zSZLN2Gsq1as0<{!c8j^3NP?4G4 z4JS=l_FU13y98NhbZYeYR{aU1{=-kCP@N3GvT2^9gJQkTP zlQXXu{4-Y12!G$UwRB7W)S|%ek9;9`vvuL;VJb%gVXI%PxuBMh4~c`i6eTrW!xxJv z4ie$>vB4Q7XshX)xhbCOi7#ja#+tTu4+Ep==lwKg%Q-(--X2jf5h2uUapG(V);0xS&amsex${F`DVA*;_9Y0*% zUxb!#SixROe?^IseXP9UE8f+LP`bz%kSobyiiB4c8(E)G_9(0=b}=o}Wbi<2GOf5} zp}MXD%QHCcdSU@J|F4^WD$kWGcufp4kw0x@Ry%L0`;OWd1uN;mO{Xj15G|&k9}4EQ zU{I7H`lg*DdGYL&+FB_ZmB6Y~W`4te`hee&)o~yW*(}6T1Fi!v9@?J#{p8%@6R z4yq}lFBfNggA=Vg#$UTq|8U{LRP^4JEYb8ykSH}Ln@%yC=EllcLUBz&!nihwbDjfEq zPGHaF(AB#SPF)nen9_h$%-YL+pVZUIt!9j!4{FTr--1-vzb}8rzZ`}@#uF10WsYC` z*r6PFeM>Y7RV~^T8$#Aw{3DGAIWvH#CVm6c%D!U{Y~7$x@+Li|z0;A2=`Y(qc;TI| zR|3LRnV2H<&i87cZCNtsNN8{CJ^Qvg?;DNQPZ0@pEFG|@WN~}5agq=a0wZ+kiS=wK zRkLU$L`E&~>=mBbBv1nx0$twOPoLVI%t?JN$nw_TWMW3tkF(g)YnWN^xD*@@1Y!rk41hkd z9s@dChv6u_1-9a;Y@K2t%a;EaN+%f6p^!VSwtwz@9p=EI2onD=)aL)$gl4qP5ead) zyw$poYh+kv^tTg4{5P-K&bE>pWBU(6&!2`KX-s3jWP~c_#qU5>$#%wZ7*X;lB!;vv z{&s({IhKyy$I`KT$EcXB@y8;pncsid0W;zYY>E@Fwba@_SN%VrRFLAO0o^9QA_Mnh z;f}q);5X)d%f!w<9k7573;~9Y1weS45CeQnXA8#8PO&MyAo75{Rx)AABJ)SYEIx-M zpi2cMW5zZux()JDlfttGs;6cgTl>=K*j*5SVUv59r9xm*YH{ElfR2L@W(aGhtrZZ& zED7_LZ4O+~cb>2>t#tS%e14xfb0<_J_6%2*AS49mZykaV6S`Mt8{<~VI~08S&W_(Z zex5C;(^8YZrGP#vT-T#(5vLWs?71H0{6@YW=H7DqdqQ6D4?gOSp2Gi46(xnuukqL5 KtwUvp4*eI0VG^eR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a0ad676bca797ea4d828ab75d9ce68686b09e50a GIT binary patch literal 840 zcmWIWW@Zs#U|`^2*g1E1P=rtR#%3VzI1md0v8%hguBV@yzkYx>gpqpoAlD%S0hSBZ z3jZg_cf2q)U&`+2+q!7p^|Y;xIl*O@o9owiWE^;GlQx4{j3eN{yosvMF3!A~v~nuD zQ+m^asf-fMz8|%s{(41~8Vi0nJah8>pWhyBy_M!U zy;IWrlVz>clzERs?#;jd&d_mZ>awnR0Vpo+srQix2fB0#5QF>ycX6=(e#s)1?Te;dX}Yp!%9TA&ycW2`l^NDuRsG5O(Q;+#N=t=Q22_VkX1i|040He^ z5X&MvBqg;VH7_MKFS#;4Co?a*804bIOn7vQA?q&5FNn`cElbV8s%=f{A`up#awZ@~ ziLa{60^Q=owA9B>K{hcmiGTwKdn5z(g2A>%5CsoFSd^n{M-Op`W(J0Bjhm3QBZWV@ z3FtwEFu@uadT<9|3pjj6fx-<2wl!8F8-)^z=w_e?BEpOf$Y#KTG{Bpc4Wxt>2>pQy J9s@B00{~#t_00eP literal 0 HcmV?d00001 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 + )