wip

CoderBotOrg · previ · Apr 10, 2023 · Apr 18, 2023 · Apr 25, 2023 · May 7, 2023
commit a430f2ad334e1dcafe7c18bcb1aad30afc71c7fa
diff --git a/coderbot/api.py b/coderbot/api.py
@@ -412,4 +412,22 @@ def cloudSyncRequest():
     return 200
 
 def cloudSyncStatus():
-    return CloudManager.get_instance().sync_status()
+    return CloudManager.get_instance().sync_status()
+
+def cloudRegistrationRequest():
+    CloudManager.get_instance().register()
+    return 200
+
+def cloudRegistrationDelete():
+    CloudManager.get_instance().unregister()
+    return 200
+
+def cloudRegistrationStatus():
+    return {
+        "registered": CloudManager.get_instance().registration_status(),
+        "name": config.get('coderbot_name', ""),
+        "description": config.get('coderbot_description', ""),
+        "org_id": config.get('org_id', ""),
+        "org_name": config.get('org_name', ""),
+        "org_description": config.get('org_description', "")
+    }
diff --git a/coderbot/cloud/__init__.py b/coderbot/cloud/__init__.py
@@ -88,6 +88,36 @@ def __init__(self):
             self.write_auth({})
         self.start()
 
+    def register(self, registration_request):
+        logging.info("register.check.token")
+        token = self.get_auth().get("token")
+        if token:
+            logging.warn("register.check.token_already_there")
+            return
+        reg_otp = registration_request.get("otp")
+        try:
+            self._sync_status["registration"] = "registering"
+            logging.info("register.get_token")
+            with cloud_api_robot_client.ApiClient(self.configuration) as api_client:
+                api_instance = robot_sync_api.RobotSyncApi(api_client)
+                body = RobotRegisterData(
+                    otp=reg_otp,
+                )
+                api_response = api_instance.register_robot(body=body)
+                logging.info(api_response.body)
+                token = api_response.body.get("token")
+                self.write_auth({"token":token})
+            self._sync_status["registration"] = "registered"
+        except cloud_api_robot_client.ApiException as e:
+            logging.warn("Exception when calling register_robot RobotSyncApi: %s\n" % e)
+            raise
+
+    def unregister(self):
+        self.write_auth({ "token": None })
+
+    def registration_status(self):
+        return self._auth.get("token") is not None
+
     def run(self):
         while(True):
             sync_period = int(Config.read().get("sync_period", "60"))
@@ -109,20 +139,21 @@ def sync(self):
         logging.info("run.sync.begin")
         sync_modes = settings.get("sync_modes", {"settings": "n", "activities": "n", "programs": "n"})
 
-        try:
-            token = self.get_token_or_register(settings)
-            self.configuration.access_token = token
+        token = self.get_auth().get("token")
+        if token is not None:
+            try:
+                self.configuration.access_token = token
 
-            # 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, sync_modes["settings"])
-                self.sync_activities(api_instance, sync_modes["activities"])
-                self.sync_programs(api_instance, sync_modes["programs"])
-        except Exception as e:
-            logging.warn("run.sync.api_not_available: " + str(e))
+                # 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, sync_modes["settings"])
+                    self.sync_activities(api_instance, sync_modes["activities"])
+                    self.sync_programs(api_instance, sync_modes["programs"])
+            except Exception as e:
+                logging.warn("run.sync.api_not_available: " + str(e))
 
         logging.info("run.sync.end")
         self._syncing = False
@@ -133,6 +164,7 @@ def get_token_or_register(self, settings):
         reg_otp = settings.get("reg_otp")
         try:
             if token is None and reg_otp is not None:
+                self._sync_status["registration"] = "registering"
                 logging.info("run.get_token_or_register.get_token")
                 with cloud_api_robot_client.ApiClient(self.configuration) as api_client:
                     api_instance = robot_sync_api.RobotSyncApi(api_client)
@@ -143,6 +175,7 @@ def get_token_or_register(self, settings):
                     logging.info(api_response.body)
                     token = api_response.body.get("token")
                     self.write_auth({"token":token})
+            self._sync_status["registration"] = "registered"
             return token
         except cloud_api_robot_client.ApiException as e:
             logging.warn("Exception when calling register_robot RobotSyncApi: %s\n" % e)
@@ -181,6 +214,7 @@ def sync_settings(self, api_instance, sync_mode):
             self._sync_status["settings"] = "synced"
         except cloud_api_robot_client.ApiException as e:
             logging.warn("Exception when calling settings RobotSyncApi: %s\n" % e)
+            self._sync_status["registration"] = "failed"
 
     def sync_activities(self, api_instance, sync_mode):
         try:

diff --git a/coderbot/v1.yml b/coderbot/v1.yml
@@ -605,6 +605,49 @@ paths:
       responses:
         200:
           description: "CNN Model deleted"
+
+  /cloud/registration:
+    post:
+      operationId: "api.cloudRegistrationRequest"
+      summary: "request a Registration activity"
+      tags:
+        - Cloud Sync
+      requestBody:
+        description: Registration Request parameters
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CloudRegistrationRequest'
+      responses:
+        200:
+          description: "Cloud Sync request"
+    get:
+      operationId: "api.cloudRegistrationStatus"
+      summary: "get status of a Registration activity"
+      tags:
+        - Cloud Sync
+      responses:
+        200:
+          description: "Cloud Sync request"
+          content:
+            application/json:
+              schema:
+                  $ref: '#/components/schemas/CloudRegistrationStatus'
+
+    delete:
+      operationId: "api.cloudRegistrationDelete"
+      summary: "get status of a Registration activity"
+      tags:
+        - Cloud Sync
+      responses:
+        200:
+          description: "Cloud Sync request"
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CloudRegistrationStatus'
+
   /cloud/sync:
     post:
       operationId: "api.cloudSyncRequest"
@@ -743,7 +786,41 @@ components:
         - description
         - default
         - kind
-
+
+    CloudRegistrationRequest:
+      type: object
+      properties:
+        name:
+          type: string
+          minLength: 4
+          maxLength: 64          
+        description:
+          type: string
+          minLength: 4
+          maxLength: 256      
+        otp:
+          type: string
+          minLength: 8
+          maxLength: 8          
+
+    CloudRegistrationStatus:
+      type: object
+      properties:
+        name:
+          type: string
+          minLength: 1
+          maxLength: 64          
+        description:
+          type: string
+          minLength: 0
+          maxLength: 256      
+        org_id:
+          type: string
+        org_name:
+          type: string
+        org_description:
+          type: string
+
     CloudSyncStatus:
       type: object
       properties: