Gedis with ZDB backend #24

Author: BolaNasr

DigitalMe/servers/gedis/GedisCmds.py

@@ -51,7 +51,7 @@ def __init__(self, server=None, namespace="default", name="", path="", capnpbin=
             kobj = klass()
             if hasattr(kobj, "schema"):
                 # means is a generated actor which exposes a model (schema)
-                key = "%s__model_%s" % (self.namespace, kobj.schema.name)
+                key = "%s__model_%s" % (self.namespace, kobj.schema.url)
             else:
                 key = "%s__%s" % (self.namespace, cname.replace(".", "_"))
 

DigitalMe/servers/gedis/templates/actor_model_server.py

@@ -52,7 +52,7 @@ def find(self, total_items_in_page=20, page_number=1, only_fields=[], **args):
             import ast
             only_fields = ast.literal_eval(only_fields.decode())
         return self.model.find(hook=self.hook_get, capnp=True, total_items_in_page=total_items_in_page,
-                               page_number=page_number, only_fields=only_fields, {{kwargs}})
+                               page_number=page_number, only_fields=only_fields)
 
     def new(self):
         return self.model.new()

packages/notary/README.md

@@ -2,11 +2,14 @@
 ## in kosmos run the following: 
 ```python
 
+zdb_cl = j.clients.zdb.start_test_instance()
+zdb_cl = zdb_cl.namespace_new("notary_namespace", secret="1234")
+bcdb = j.data.bcdb.new(zdbclient=zdb_cl, name="notary_bcdb")
+bcdb.models_add("/sandbox/code/github/threefoldtech/digitalmeX/packages/notary/models")
 server = j.servers.gedis.configure(host="0.0.0.0", port=8888)
-
-server.actor_add('/sandbox/code/github/threefoldtech/digitalmeX/packages/notary/actors/notary_actor.py') 
-
-server.start()                                            
+server.actor_add('/sandbox/code/github/threefoldtech/digitalmeX/packages/notary/actors/notary_actor.py')
+server.models_add(models=bcdb.models.values())
+server.start()                                          
 ```
 ## using Tmux
 ```
@@ -28,5 +31,5 @@ http://localhost:8080/get?key="test"
 
 ## to delete 
 ```
-http://localhost:8080/delete?robot_id="123",key="test",key_signature="Notary_test"
+http://localhost:8080/delete?robot_id="123"&key="test"&content_signature="Notary_test"
 ```

packages/notary/actors/notary_actor.py

@@ -11,6 +11,13 @@ class notary_actor(JSBASE):
     def start_page(self):
         return "welcome to https://github.com/threefoldtech/home/issues/135"
 
+    def bcdb_get(self):
+        zdb_cl = j.clients.zdb.start_test_instance()
+        zdb_cl = zdb_cl.namespace_new("notary_namespace", secret="1234")
+        bcdb = j.data.bcdb.new(zdbclient=zdb_cl, name="notary_bcdb")
+        bcdb.models_add("/sandbox/code/github/threefoldtech/digitalmeX/packages/notary/models")
+        return bcdb
+
     def register(self, robot_id, key, content, content_signature, schema_out):
         """
         ```in
@@ -24,6 +31,15 @@ def register(self, robot_id, key, content, content_signature, schema_out):
         ```
         """
         out = schema_out.new()
+        bcdb = self.bcdb_get()
+        model = bcdb.models.get("threefold.grid.notary")
+        model_obj = model.new()
+        model_obj.robot_id = robot_id
+        model_obj.key = key
+        model_obj.content = content
+        model_obj.content_signature = content_signature
+        model_obj.save()
+
         out.message = "your register info is robot_id = {} , key = {}, content = {} ,content_signature ={}".format(
             robot_id, key, content, content_signature)
         return out
@@ -38,21 +54,29 @@ def get(self, key, schema_out):
         ```
         """
         out = schema_out.new()
-        # TODO: return json object
-        out.message = "your key is {}".format(key)
+        bcdb = self.bcdb_get()
+        for model in bcdb.get_all():
+            if model.key == key:
+                return model
+
+        out.message = "this key doesn't exist"
         return out
 
-    def delete(self, robot_id, key, key_signature, schema_out):
+    def delete(self, robot_id, key, content_signature, schema_out):
         """
         ```in
         robot_id = "" (S)
         key = "" (S)
-        key_signature = "" (S)
+        content_signature = "" (S)
         ```
         ```out
         message = "" (S)
         ```
-        """
-        out = schema_out.new()
-        # TODO: return true if success deleted from zdb otherwise return false
+       """
+        bcdb = self.bcdb_get()
+        for model in bcdb.get_all():
+            if model.key == key and model.robot_id == robot_id and model.content_signature == content_signature:
+                model.delete()
+                model.save()
+                return "True"
         return "False"

packages/notary/app.lua

@@ -38,9 +38,9 @@ do
       local client = redis.connect(config.gedis_host, config.gedis_port)
       client["gedis"] = redis.command("default.notary_actor.delete")
       local args = {
-        ["robot_id"] = self.params.id,
+        ["robot_id"] = self.params.robot_id,
         ["key"] = self.params.key,
-        ["key_signature"] = self.params.key_signature
+        ["content_signature"] = self.params.content_signature
       }
       local header = {
         ["response_type"] = "json"

packages/notary/app.moon

@@ -41,9 +41,9 @@ class extends lapis.Application
     client["gedis"] = redis.command("default.notary_actor.delete")
 
     args = {
-      "robot_id": @params.id,
+      "robot_id": @params.robot_id,
       "key": @params.key,
-      "key_signature": @params.key_signature
+      "content_signature": @params.content_signature
     }
     header = {
       "response_type": "json"

packages/notary/models/__init__.py

@@ -0,0 +1,8 @@
+# notary_model
+@url = threefold.grid.notary
+name* = "" 
+comment = ""
+robot_id* = "" (S)   
+key* = (S)      
+content =  (S)           
+content_signature = (S)