Skip to content

fix: verbbuilder.py #566

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.

Sign up for GitHub

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

Merged
JeremyTubongbanua merged 3 commits into from
Sep 22, 2026
Merged

fix: verbbuilder.py #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8bdce8
fix: verbbuilder.py
JeremyTubongbanua Sep 21, 2026
05cce9d
fix: NotifyVerbBuilder symmetry with Dart SDK
JeremyTubongbanua Sep 21, 2026
c1f8e85
test: update verbbuilder_test.py to be symmetric with Dart SDK
JeremyTubongbanua Sep 21, 2026
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
14 changes: 7 additions & 7 deletions at_client/util/verbbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def set_metadata(self, metadata):
return self

def with_at_key(self, at_key, value):
self.set_key_name(at_key.name)
self.set_key_name(at_key.get_fully_qualified_key_name())
self.set_shared_by(str(at_key.shared_by))
if at_key.shared_with and str(at_key.shared_with):
self.set_shared_with(str(at_key.shared_with))
Expand Down Expand Up @@ -276,7 +276,7 @@ def set_type(self, type):
return self

def with_at_key(self, at_key, type):
self.set_key_name(at_key.name)
self.set_key_name(at_key.get_fully_qualified_key_name())
self.set_shared_by(str(at_key.shared_by))
if at_key.shared_with is not None and at_key.shared_with:
self.set_shared_with(str(at_key.shared_with))
Expand Down Expand Up @@ -333,7 +333,7 @@ def set_type(self, type):
return self

def with_shared_key(self, shared_key, type):
self.set_key_name(shared_key.name)
self.set_key_name(shared_key.get_fully_qualified_key_name())
self.set_shared_with(str(shared_key.shared_with))
self.set_type(type)
return self
Expand Down Expand Up @@ -383,7 +383,7 @@ def set_bypass_cache(self, bypass_cache):
return self

def with_at_key(self, at_key, type):
self.set_key_name(at_key.name)
self.set_key_name(at_key.get_fully_qualified_key_name())
self.set_shared_by(str(at_key.shared_by))
self.set_type(type)
return self
Expand Down Expand Up @@ -440,7 +440,7 @@ def set_is_cached(self, is_cached):
return self

def with_at_key(self, at_key):
self.set_key_name(at_key.name)
self.set_key_name(at_key.get_fully_qualified_key_name())
self.set_shared_by(str(at_key.shared_by))
if at_key.shared_with and not str(at_key.shared_with).strip() == "":
self.set_shared_with(str(at_key.shared_with))
Expand Down Expand Up @@ -543,15 +543,15 @@ def set_session_id(self, session_id):
return self

def with_at_key(self, at_key, encrypted_value, operation=OperationEnum.UPDATE, session_id=None):
self.set_key_name(at_key.name)
self.set_key_name(at_key.get_fully_qualified_key_name())
self.set_shared_by(str(at_key.shared_by))
self.set_shared_with(str(at_key.shared_with))
self.set_is_hidden(at_key.metadata.is_hidden)
self.set_is_public(at_key.metadata.is_public)
self.set_is_cached(at_key.metadata.is_cached)
self.set_metadata(at_key.metadata)
self.set_value(encrypted_value)
self.set_namespace(at_key.namespace)
self.set_namespace(None)
self.set_session_id(session_id)
self.operation = operation
if self.message_type is None:
Expand Down
52 changes: 36 additions & 16 deletions test/verbbuilder_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,47 +328,67 @@ def test_delete_verb_builder(self):
self.assertEqual("delete:@bob:test@alice", command)


def test_namespaced_at_key_verb_builders(self):
alice = AtSign("@alice")
bob = AtSign("@bob")
public_key = PublicKey("publickey", alice).set_namespace("mynamespace")
shared_key = SharedKey("sharedkey", alice, bob).set_namespace("mynamespace")

command = UpdateVerbBuilder().with_at_key(public_key, "value").build()
self.assertEqual("update:public:publickey.mynamespace@alice value", command)

command = LlookupVerbBuilder().with_at_key(shared_key, LlookupVerbBuilder.Type.NONE).build()
self.assertEqual("llookup:@bob:sharedkey.mynamespace@alice", command)

command = LookupVerbBuilder().with_shared_key(shared_key, LookupVerbBuilder.Type.NONE).build()
self.assertEqual("lookup:sharedkey.mynamespace@bob", command)

command = PlookupVerbBuilder().with_at_key(public_key, PlookupVerbBuilder.Type.NONE).build()
self.assertEqual("plookup:publickey.mynamespace@alice", command)

command = DeleteVerbBuilder().with_at_key(shared_key).build()
self.assertEqual("delete:@bob:sharedkey.mynamespace@alice", command)

command = NotifyVerbBuilder().with_at_key(shared_key, "value").build()
command_without_id = re.sub(r'\bid:[^:]*:', '', command)
self.assertEqual("notify:update:isEncrypted:true:@bob:sharedkey.mynamespace@alice:value", command_without_id)

def test_notify_verb_builder(self):
# with a shared key, no metadata and no namespace
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob"))
command = NotifyVerbBuilder().with_at_key(sk, "valuevaluevalue").build()
command_without_id = re.sub(r'\bid:[^:]*:', '', command)
print(command_without_id)
self.assertRegex(command_without_id, "notify:update:isEncrypted:true:@bob:test@alice:valuevaluevalue")
self.assertEqual("notify:update:isEncrypted:true:@bob:test@alice:valuevaluevalue", command_without_id)

#with a shared key, metadata and no namespace
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob"))
metadata = Metadata(ttl="1000", ttr="-1")
metadata = Metadata(ttl=1000, ttr=-1)
sk.metadata = metadata
command = NotifyVerbBuilder().with_at_key(sk, "valuevaluevalue").build()
command_without_id = re.sub(r'\bid:[^:]*:', '', command)
self.assertRegex(command_without_id, "notify:update:ttl:1000:ttr:-1:isEncrypted:true:@bob:test@alice:valuevaluevalue")
self.assertEqual("notify:update:ttl:1000:ttr:-1:isEncrypted:true:@bob:test@alice:valuevaluevalue", command_without_id)

#with a shared key, no metadata and namespace
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob"))
sk.namespace = ".dave"
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob")).set_namespace("dave")
command = NotifyVerbBuilder().with_at_key(sk, "valuevaluevalue").build()
command_without_id = re.sub(r'\bid:[^:]*:', '', command)
self.assertRegex(command_without_id, "notify:update:isEncrypted:true:@bob:test.dave@alice:valuevaluevalue")
self.assertEqual("notify:update:isEncrypted:true:@bob:test.dave@alice:valuevaluevalue", command_without_id)

#with a shared key, metadata and namespace
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob"))
metadata = Metadata(ttl="1000", ttr="-1")
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob")).set_namespace("dave")
metadata = Metadata(ttl=1000, ttr=-1)
sk.metadata = metadata
sk.namespace = ".dave"
command = NotifyVerbBuilder().with_at_key(sk, "valuevaluevalue").build()
command_without_id = re.sub(r'\bid:[^:]*:', '', command)
self.assertRegex(command_without_id, "notify:update:ttl:1000:ttr:-1:isEncrypted:true:@bob:test.dave@alice:valuevaluevalue")

self.assertEqual("notify:update:ttl:1000:ttr:-1:isEncrypted:true:@bob:test.dave@alice:valuevaluevalue", command_without_id)

#with a shared key, with metadata and namespace (no caching)
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob"))
metadata = Metadata(ttln="1000")
sk = SharedKey("test", AtSign("@alice"), AtSign("@bob")).set_namespace("dave")
metadata = Metadata(ttln=1000)
sk.metadata = metadata
sk.namespace = ".dave"
command = NotifyVerbBuilder().with_at_key(sk, "valuevaluevalue").build()
command_without_id = re.sub(r'\bid:[^:]*:', '', command)
self.assertRegex(command_without_id, "notify:update:ttln:1000:isEncrypted:true:@bob:test.dave@alice:valuevaluevalue")
self.assertEqual("notify:update:ttln:1000:isEncrypted:true:@bob:test.dave@alice:valuevaluevalue", command_without_id)

if __name__ == '__main__':
unittest.main()
Loading