Skip to content

Cloud Sync #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 60 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
51f0346
sync setting, activities
previ Apr 10, 2023
c857b1a
wip
previ Apr 18, 2023
a2e6f39
wip
previ Apr 25, 2023
e17230d
wip
previ May 7, 2023
29b0dc4
wip
previ May 21, 2023
15d215d
wip
previ May 28, 2023
f5a4395
wip
previ May 29, 2023
57b2f03
wip
previ Jun 1, 2023
19a4398
wip
previ Jun 2, 2023
9377a57
wip
previ Jun 4, 2023
1cf11aa
wip
previ Jun 4, 2023
8f0e377
wip
previ Jun 4, 2023
0607076
wip
previ Jun 5, 2023
fba1635
wip
previ Jun 5, 2023
e5a2592
wip
previ Jun 5, 2023
870ea4b
wip
previ Jun 5, 2023
ab77159
wip
previ Jun 5, 2023
0b84abb
wip
previ Jun 5, 2023
cb8f7f9
wip
previ Jun 5, 2023
0645172
wip
previ Jun 5, 2023
304f221
wip
previ Jun 5, 2023
affa726
wip
previ Jun 5, 2023
b2999aa
wip
previ Jun 6, 2023
a430f2a
wip
previ Jun 11, 2023
639d4b9
wip
previ Aug 16, 2023
f23d78f
wip
previ Aug 16, 2023
1ba0456
update default config.json
previ Aug 19, 2023
bd2ee94
increase initial delay for testing
previ Aug 19, 2023
f1817f8
debug test api
previ Aug 19, 2023
16ffbad
debug tests
previ Aug 19, 2023
b49c58d
debug tests
previ Aug 19, 2023
24ef531
Update camera_test.py - fix tests
previ Aug 19, 2023
52f5dd1
Update coderbot_test.py - fix
previ Aug 19, 2023
f65bc87
Update camera_test.py fix
previ Aug 19, 2023
7c13bb3
Update coderbot_test.py fix
previ Aug 19, 2023
7070b18
Update coderbot_test.py -fix
previ Aug 19, 2023
14f6478
Update coderbot_test.py fix servo test
previ Aug 19, 2023
164da91
Update Dockerfile stub add CODERBOT_CLOUD_API_ENDPOINT
previ Aug 19, 2023
45e0bce
fixes
previ Aug 26, 2023
8198e09
fix
previ Aug 27, 2023
bfaa258
fix
previ Aug 27, 2023
6969fea
fix
previ Aug 27, 2023
f639184
fix
previ Aug 27, 2023
24dde58
fix
previ Aug 27, 2023
f50165b
wip
previ Dec 23, 2023
4967d4d
bumo deps
previ Dec 24, 2023
ffcb801
bump deps
previ Dec 24, 2023
b6a4401
bump deps
previ Dec 24, 2023
d8ef622
fix audio_devide
previ Dec 24, 2023
e929c0e
fix bot, cam
previ Dec 24, 2023
c89f25c
fix video stream
previ Dec 24, 2023
9ad1051
add uuid
previ Dec 28, 2023
f561d46
add uuid
previ Dec 28, 2023
5880e87
add uuid
previ Dec 28, 2023
2b1be19
add uuid
previ Dec 28, 2023
ca68f8f
fix sync activity, program
previ Dec 30, 2023
e0582ac
fix daveProgram case of null body
previ Dec 31, 2023
e214e59
sync settings
previ Dec 31, 2023
93735f7
fix detectMultiScale
previ Feb 28, 2024
13e081a
schemathesis==3.24.3
previ Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
sync setting, activities
  • Loading branch information
previ committed Apr 10, 2023
commit 51f034694d73fb5578a8025e9bba4bfadd43e475
171 changes: 171 additions & 0 deletions coderbot/cloud/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
# Sync CoderBot configuration with remote Cloud configuration
#
# For all configuration entities (settings, activities, programs):
# check sync mode (upstream, downstream, both)
# if up:
# compare entity, if different, push changes
# if down:
# compare entity, if different, pull changes
# if both:
# compare entity, if different, take most recent and push/pull changes
#

import threading
from datetime import datetime, timezone
import logging
import json
from time import sleep

from config import Config
from activity import Activities
from program import ProgramEngine

import cloud_api_robot_client
from cloud_api_robot_client.apis.tags import robot_sync_api
from cloud_api_robot_client.model.activity import Activity
from cloud_api_robot_client.model.program import Program
from cloud_api_robot_client.model.robot_data import RobotData
from cloud_api_robot_client.model.setting import Setting

class CloudManager(threading.Thread):
_instance = None

@classmethod
def get_instance(cls):
if cls._instance is None:
cls._instance = CloudManager()
return cls._instance

def __init__(self):
threading.Thread.__init__(self)
# Defining the host is optional and defaults to https://api.coderbot.org/api/v1
# See configuration.py for a list of all supported configuration parameters.
self.configuration = cloud_api_robot_client.Configuration(
host = "http://192.168.1.8:8090/api/v1",
# Configure Bearer authorization: coderbot_auth
)
self.configuration.access_token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IkNaMVFtVGM1WGZIV2NfQ1dPVG9kcm1QaXZFNFJ2ckFXaFZ3T28yTm85eDAifQ.eyJpc3MiOiJDb2RlckJvdCBDbG91ZCBBUEkiLCJpYXQiOjE2Nzc3MDI4NjIsImV4cCI6MTcwOTIzODg2MiwiYXVkIjoic3QtYXBpLmNvZGVyYm90Lm9yZyIsInN1YiI6InRwWkpYNFlsNElZd21QSzhEd2JmIiwiZW1haWwiOiJ0cFpKWDRZbDRJWXdtUEs4RHdiZkBib3RzLmNvZGVyYm90Lm9yZyIsInBpY3R1cmUiOiJodHRwczovL3N0LWFwcC5jb2RlcmJvdC5vcmcvcGljdHVyZXMvbm9waWMifQ.WlrYd-n6-WWHUxlz1kqnGl8TkjspVWn1UhKK_RIWyIJVlczD1GkqT4uqkHl2aGnp9I_E2SETUvC3dWkkUBG7qHvUIIZVaVhGpfiQy7WMekEdMnXtsPxK8NsWjHYUTbqz2dyz2Z1eQi5Ydhj4niEWsKCAT2BG-nwTIDxu-uxKrah6AtCGGyGKCQu0qje-qUNCxT5S1Y5RT10XS4Ewl2ROsMr1M6P3EVa0VoSJ26QZlh5jIz-8fhyGspxBHFEnZF-p95vEGCQp6M7epwoesDGVlX4AxEEpPk7c_Pd4c2gNLx1nhpkV26sT_c_NESNTM42tVyH9ZjQ5fxCUOEi_ELJ2vQ'

self.start()

def run(self):
while(True):
logging.info("run.begin")
settings = Config.read()
syncmodes = settings.get("syncmodes", {"settings": "n", "activities": "n", "programs": "n"})
# Enter a context with an instance of the API client
with cloud_api_robot_client.ApiClient(self.configuration) as api_client:
# Create an instance of the API class
api_instance = robot_sync_api.RobotSyncApi(api_client)

self.sync_settings(api_instance, syncmodes["settings"])

self.sync_activities(api_instance, syncmodes["activities"])

self.sync_programs(api_instance, syncmodes["programs"])

sleep(10)
logging.info("run.end")

def sync_settings(self, api_instance, syncmode):
try:
# Create an instance of the API class
api_response = api_instance.get_robot_setting()
cloud_setting_object = api_response.body
cloud_setting = json.loads(cloud_setting_object.get('data'))
local_setting = Config.read()
local_most_recent = datetime.fromisoformat(cloud_setting_object["modified"]).timestamp() < Config.modified()
if cloud_setting != local_setting:
if syncmode == "u" or (syncmode == "b" and local_most_recen):
body = Setting(
id=api_response.body.get('id'),
org_id=api_response.body.get('org_id'),
name=api_response.body.get('name'),
description=api_response.body.get('description'),
data=json.dumps(setting),
modified=datetime.now().isoformat(),
status=api_response.body.get('status'),
)
api_response = api_instance.set_robot_setting(body)
logging.info("run.4")
if syncmode == 'd': # setting, down
logging.info("cloud_setting: ", str(cloud_setting.data.setting))
Config.write(cloud_setting.data.setting)
except cloud_api_robot_client.ApiException as e:
logging.warn("Exception when calling RobotSyncApi: %s\n" % e)

def sync_activities(self, api_instance, syncmode):
activities = Activities.get_instance().list()
try:
# Get robot activities
api_response = api_instance.get_robot_activities()
cloud_activities = api_response.body
logging.info("run.activities.cloud" + str(cloud_activities))
# cloud activities
a_c_m = {} # activities_cloud_map
for a in cloud_activities:
a_c_m[a.get("id")] = a

a_l_m = {} # activities_local_map
# local activities no id
for a in activities:
if a.get("id") is not None:
a_l_m[a.get("id")] = a

# loop through local
for al in activities:
logging.info("syncing: " + str(al.get("id")))
ac = a_c_m.get(al.get("id"))
if ac is not None:
al["modified"] = al.get("modified", datetime.now(tz=timezone.utc).isoformat())
local_activity_more_recent = datetime.fromisoformat(ac.get("modified")).timestamp() < datetime.fromisoformat(al.get("modified")).timestamp()
if syncmode == "u" or (local_activity_more_recent and syncmode == 'b'):
ac["data"] = al.get("data")
ac["modified"] = al.get("modified")
body = Activity(
id=ac.get("id"),
org_id=ac.get("org_id"),
name=al.get("name"),
description=al.get("description"),
data=json.dumps(al.get("data")),
modified=al.get("modified").isoformat(),
status='active',
)
#logging.info("run.activities.cloud.saving")
api_response = api_instance.set_robot_activity(ac.get("id"), body)
#logging.info("run.activities.cloud.saved")
elif syncmode == "d" or (not local_activity_more_recent and syncmode == 'b'):
al["data"] = ac.get("data")
al["modified"] = ac.get("modified")
Activities.get_instance().save(al.get("name"), al)
logging.info("run.activities.local.saved: " + ac.get("name"))
elif ac is None and syncmode in ['u', 'b']:
#logging.info("activity:" + str(al))
body = Activity(
id="",
org_id="",
name=al.get("name"),
description=al.get("description"),
data=json.dumps(al),
modified=al.get("modified", datetime.now(tz=timezone.utc).isoformat()),
status="active",
)
api_response = api_instance.create_robot_activity(body=body)
logging.info("run.activities.cloud.created: " + str(api_response.body["id"]))
al["id"] = api_response.body["id"]
al["org_id"] = api_response.body["org_id"]
logging.info("run.activities.saving_local: " + al.get("name"))
Activities.get_instance().save(al.get("name"), al)
elif ac is None and syncmode in ['d']:
logging.info("run.activities.deleting_local: " + al.get("name"))
Activities.get_instance().delete(al.get("name"))
for ac, k in a_c_m.items():
if a_l_m.get(k) is None and syncmode in ['d', 'b']:
Activities.get_instance().save(ac.get("name"), ac)
logging.info("run.activities.local.saved: " + ac.get("name"))

except cloud_api_robot_client.ApiException as e:
logging.warn("Exception when calling RobotSyncApi: %s\n" % e)

def sync_programs(self, api_client, syncmode):
pass
3 changes: 3 additions & 0 deletions coderbot/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ def restore(cls):
with open(CONFIG_DEFAULT_FILE) as f:
cls.write(json.loads(f.read()))

@classmethod
def modified(cls):
return os.stat(CONFIG_FILE).st_mtime
4 changes: 4 additions & 0 deletions coderbot/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from cnn.cnn_manager import CNNManager
from event import EventManager
from coderbot import CoderBot
from cloud import CloudManager

# Logging configuration
logger = logging.getLogger()
Expand Down Expand Up @@ -89,6 +90,9 @@ def run_server():
if app.bot_config.get('load_at_start') and app.bot_config.get('load_at_start'):
prog = app.prog_engine.load(app.bot_config.get('load_at_start'))
prog.execute()

CloudManager.get_instance()

except ValueError as e:
app.bot_config = {}
logging.error(e)
Expand Down
18 changes: 14 additions & 4 deletions coderbot/program.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
import json
import shutil
import logging

from datetime import datetime
import math

from tinydb import TinyDB, Query
from threading import Lock

Expand Down Expand Up @@ -159,12 +160,14 @@ class Program:
def dom_code(self):
return self._dom_code

def __init__(self, name, code=None, dom_code=None, default=False):
def __init__(self, name, code=None, dom_code=None, default=False, id=None, modified=None):
self._thread = None
self.name = name
self._dom_code = dom_code
self._code = code
self._default = default
self._id = id
self._modified = modified

def execute(self, options={}):
if self._running:
Expand Down Expand Up @@ -242,8 +245,15 @@ def as_dict(self):
return {'name': self.name,
'dom_code': self._dom_code,
'code': self._code,
'default': self._default}
'default': self._default,
'id': self._id,
'modified': self._modified.isoformat()}

@classmethod
def from_dict(cls, amap):
return Program(name=amap['name'], dom_code=amap['dom_code'], code=amap['code'], default=amap.get('default', False))
return Program(name=amap['name'],
dom_code=amap['dom_code'],
code=amap['code'],
default=amap.get('default', False),
id=amap.get('id', None),
modified=datetime.fromisoformat(amap.get('modified', datetime.now().isoformat())))
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy