Ability to store metadata with an identifier #1051

src/keri/app/__init__.py

@@ -5,3 +5,5 @@
 keri.app package
 
 """
+
+from .organizing import Organizer, IdentifierOrganizer

src/keri/app/cli/commands/challenge/respond.py

@@ -7,7 +7,7 @@
 
 from hio.base import doing
 
-from keri.app import habbing, forwarding, connecting
+from keri.app import habbing, forwarding, organizing
 from keri.app.cli.common import existing 
 from keri.app.cli.common.parsing import Parsery
 from keri.app.habbing import GroupHab
@@ -75,7 +75,7 @@ def __init__(self, name, base, bran, alias, words: list, recp: str):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.postman = forwarding.Poster(hby=self.hby)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         doers = [self.hbyDoer, self.postman, doing.doify(self.respondDo)]
 
         super(RespondDoer, self).__init__(doers=doers)

src/keri/app/cli/commands/challenge/verify.py

@@ -11,7 +11,7 @@
 from hio.base import doing
 
 from keri import help
-from keri.app import indirecting, challenging, connecting, signaling
+from keri.app import indirecting, challenging, organizing, signaling
 from keri.app.cli.commands.challenge.generate import generateWords
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
@@ -66,7 +66,7 @@ def __init__(self, name, base, bran, words, generate, strength, out, signer):
         self.signer = signer
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.exc = exchanging.Exchanger(hby=self.hby, handlers=[])
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         signaler = signaling.Signaler()
 
         challenging.loadHandlers(db=self.hby.db, signaler=signaler, exc=self.exc)

src/keri/app/cli/commands/contacts/list.py

@@ -11,7 +11,7 @@
 from hio.base import doing
 
 from keri import help, kering
-from keri.app import connecting
+from keri.app import organizing
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError
@@ -39,7 +39,7 @@ def list(tymth, tock=0.0, **opts):
 
     try:
         with existing.existingHby(name=name, base=base, bran=bran) as hby:
-            org = connecting.Organizer(hby=hby)
+            org = organizing.Organizer(hby=hby)
             for c in org.list():
 
                 aid = c['id']

src/keri/app/cli/commands/contacts/replace.py

@@ -10,7 +10,7 @@
 from hio.base import doing
 
 from keri import help
-from keri.app import connecting
+from keri.app import organizing
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError
@@ -44,7 +44,7 @@ def replace(tymth, tock=0.0, **opts):
 
     try:
         with existing.existingHby(name=name, base=base, bran=bran) as hby:
-            org = connecting.Organizer(hby=hby)
+            org = organizing.Organizer(hby=hby)
 
             if prefix not in hby.kevers:
                 print(f"{prefix} is not a known identifier, oobi must be resolved first")

src/keri/app/cli/commands/introduce.py

@@ -10,7 +10,7 @@
 from keri.app.cli.common.parsing import Parsery
 from keri.core import serdering
 from ..common import existing
-from ... import habbing, connecting, forwarding
+from ... import habbing, organizing, forwarding
 
 parser = argparse.ArgumentParser(description='Send an rpy /introduce message to recipient with OOBI', 
                                  parents=[Parsery.keystore()])
@@ -64,7 +64,7 @@ def __init__(self, name, base, bran, alias, introducee, recipient, role):
 
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.postman = forwarding.Poster(hby=self.hby)
         doers = [self.hbyDoer, self.postman, doing.doify(self.introduceDo)]
 

src/keri/app/cli/commands/ipex/admit.py

@@ -8,7 +8,7 @@
 from hio.base import doing
 
 from keri.kering import Vrsn_1_0, Vrsn_2_0
-from keri.app import connecting, habbing, grouping, indirecting, agenting, forwarding
+from keri.app import organizing, habbing, grouping, indirecting, agenting, forwarding
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.app.notifying import Notifier
@@ -52,7 +52,7 @@ def __init__(self, name, alias, base, bran, said, message, timestamp ):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.witq = agenting.WitnessInquisitor(hby=self.hby)
 
         self.kvy = eventing.Kevery(db=self.hby.db)

src/keri/app/cli/commands/ipex/grant.py

@@ -8,7 +8,7 @@
 from hio.base import doing
 
 from keri.kering import Vrsn_1_0, Vrsn_2_0
-from keri.app import forwarding, connecting, habbing, grouping, indirecting, signing
+from keri.app import forwarding, organizing, habbing, grouping, indirecting, signing
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.app.notifying import Notifier
@@ -54,7 +54,7 @@ def __init__(self, name, alias, base, bran, said, recp, message, timestamp):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         notifier = Notifier(self.hby)
         mux = grouping.Multiplexor(self.hby, notifier=notifier)
 

src/keri/app/cli/commands/ipex/join.py

@@ -11,7 +11,7 @@
 
 from keri import help
 from keri.kering import Vrsn_1_0, Vrsn_2_0
-from keri.app import habbing, indirecting, agenting, notifying, grouping, connecting, forwarding
+from keri.app import habbing, indirecting, agenting, notifying, grouping, organizing, forwarding
 from keri.app.cli.common import existing
 from keri.core import parsing, routing, serdering, coring
 from keri.peer import exchanging
@@ -60,7 +60,7 @@ def __init__(self, name, base, bran, auto=False):
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
         self.witq = agenting.WitnessInquisitor(hby=self.hby)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.notifier = notifying.Notifier(hby=self.hby)
         self.exc = exchanging.Exchanger(hby=self.hby, handlers=[])
         self.verifier = verifying.Verifier(hby=self.hby, reger=self.rgy.reger)

src/keri/app/cli/commands/ipex/list.py

@@ -14,7 +14,7 @@
 from hio.base import doing
 
 from keri import help, kering
-from keri.app import indirecting, notifying, connecting
+from keri.app import indirecting, notifying, organizing
 from keri.app.cli.common import existing, terming
 from keri.app.cli.common.parsing import Parsery
 from keri.core import scheming
@@ -73,7 +73,7 @@ def __init__(self, name, alias, base, bran, poll=False, verbose=False, said=Fals
 
         self.hab = self.hby.habByName(alias)
         self.notifier = notifying.Notifier(hby=self.hby)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
         self.vry = verifying.Verifier(hby=self.hby, reger=self.rgy.reger)
         self.exc = exchanging.Exchanger(hby=self.hby, handlers=[])

src/keri/app/cli/commands/ipex/spurn.py

@@ -9,7 +9,7 @@
 from hio.base import doing
 
 from keri.kering import Vrsn_1_0, Vrsn_2_0
-from keri.app import forwarding, connecting, habbing, grouping, indirecting
+from keri.app import forwarding, organizing, habbing, grouping, indirecting
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.app.notifying import Notifier
@@ -50,7 +50,7 @@ def __init__(self, name, alias, base, bran, said, message):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
 
         kvy = eventing.Kevery(db=self.hby.db)
         tvy = teventing.Tevery(db=self.hby.db, reger=self.rgy.reger)

src/keri/app/cli/commands/mailbox/add.py

@@ -10,7 +10,7 @@
 from hio.help import Hict
 
 from keri import help, kering
-from keri.app import connecting, habbing
+from keri.app import organizing, habbing
 from keri.app.agenting import httpClient, WitnessPublisher
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
@@ -46,7 +46,7 @@ class AddDoer(doing.DoDoer):
     def __init__(self, name, alias, base, bran, mailbox):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.witpub = WitnessPublisher(hby=self.hby)
 
         if mailbox in self.hby.kevers:

src/keri/app/cli/commands/mailbox/list.py

@@ -9,7 +9,7 @@
 from hio.base import doing
 
 from keri import help
-from keri.app import connecting
+from keri.app import organizing
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError, Roles
@@ -48,7 +48,7 @@ def listMailboxes(tymth, tock=0.0, **opts):
 
     try:
         with existing.existingHby(name=name, base=base, bran=bran) as hby:
-            org = connecting.Organizer(hby=hby)
+            org = organizing.Organizer(hby=hby)
             if alias is None:
                 alias = existing.aliasInput(hby)
 

src/keri/app/cli/commands/multisig/join.py

@@ -13,7 +13,7 @@
 
 from keri import help, kering
 from keri.kering import Vrsn_1_0, Vrsn_2_0
-from keri.app import habbing, indirecting, agenting, notifying, grouping, connecting, forwarding
+from keri.app import habbing, indirecting, agenting, notifying, grouping, organizing, forwarding
 from keri.app.cli.common import existing, displaying
 from keri.app.cli.common.parsing import Parsery
 from keri.core import coring, eventing, scheming, parsing, routing, serdering
@@ -68,7 +68,7 @@ def __init__(self, name, base, bran, group, auto=False):
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
         self.witq = agenting.WitnessInquisitor(hby=self.hby)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.notifier = notifying.Notifier(hby=self.hby)
         self.exc = exchanging.Exchanger(hby=self.hby, handlers=[])
         self.verifier = verifying.Verifier(hby=self.hby, reger=self.rgy.reger)

src/keri/app/cli/commands/multisig/shell.py

@@ -5,7 +5,7 @@
 import os
 
 from hio.base import doing
-from keri.app import connecting, apping
+from keri.app import organizing, apping
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.core import coring
@@ -37,7 +37,7 @@ def kims(tymth, tock=0.0, **opts):
     static = args.static
 
     with existing.existingHby(name=name, base=base, bran=bran) as hby:
-        org = connecting.Organizer(hby=hby)
+        org = organizing.Organizer(hby=hby)
         contacts = org.list()
         MultiSigShell(hby, contacts, static).cmdloop()
         return True

src/keri/app/cli/commands/vc/create.py

@@ -5,7 +5,7 @@
 from hio.base import doing
 
 from keri import core, help, kering
-from keri.app import indirecting, habbing, grouping, connecting, forwarding, signing, notifying
+from keri.app import indirecting, habbing, grouping, organizing, forwarding, signing, notifying
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.core import coring, eventing, serdering
@@ -145,7 +145,7 @@ def __init__(self, name, alias, base, bran, registryName=None, schema=None, edge
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
         self.counselor = grouping.Counselor(hby=self.hby)
         self.registrar = credentialing.Registrar(hby=self.hby, rgy=self.rgy, counselor=self.counselor)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.postman = forwarding.Poster(hby=self.hby)
         notifier = notifying.Notifier(self.hby)
         mux = grouping.Multiplexor(self.hby, notifier=notifier)

src/keri/app/cli/commands/vc/revoke.py

@@ -8,7 +8,7 @@
 from hio.base import doing
 
 from keri import kering
-from keri.app import indirecting, habbing, grouping, forwarding, connecting, notifying
+from keri.app import indirecting, habbing, grouping, forwarding, organizing, notifying
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.app.habbing import GroupHab
@@ -48,7 +48,7 @@ def __init__(self, name, alias, said, base, bran, registryName, send, timestamp,
         self.registryName = registryName
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
         self.counselor = grouping.Counselor(hby=self.hby)

src/keri/app/cli/commands/watcher/add.py

@@ -9,7 +9,7 @@
 from hio.base import doing
 
 from keri import help
-from keri.app import connecting, habbing, forwarding
+from keri.app import organizing, habbing, forwarding
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.core import serdering
@@ -48,7 +48,7 @@ class AddDoer(doing.DoDoer):
     def __init__(self, name, alias, base, bran, watcher, watched):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
 
         wat = None
         if watcher in self.hby.kevers:

src/keri/app/cli/commands/watcher/adjudicate.py

@@ -12,7 +12,7 @@
 from hio.base import doing
 
 from keri import help
-from keri.app import connecting, indirecting, querying, watching
+from keri.app import organizing, indirecting, querying, watching
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.help import helping
@@ -69,7 +69,7 @@ def adjudicate(self, tymth, tock=0.0, **opts):
         _ = (yield tock)
 
         try:
-            org = connecting.Organizer(hby=self.hby)
+            org = organizing.Organizer(hby=self.hby)
 
             if self.poll:
                 end = helping.nowUTC() + datetime.timedelta(seconds=5)

src/keri/app/cli/commands/watcher/list.py

@@ -9,7 +9,7 @@
 from hio.base import doing
 
 from keri import help
-from keri.app import connecting
+from keri.app import organizing
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError, Roles
@@ -48,7 +48,7 @@ def listWatchers(tymth, tock=0.0, **opts):
 
     try:
         with existing.existingHby(name=name, base=base, bran=bran) as hby:
-            org = connecting.Organizer(hby=hby)
+            org = organizing.Organizer(hby=hby)
             if alias is None:
                 alias = existing.aliasInput(hby)
 

src/keri/app/cli/commands/witness/authenticate.py

@@ -12,7 +12,7 @@
 from hio.help import Hict
 
 from keri import help
-from keri.app import httping, connecting
+from keri.app import httping, organizing
 from keri.app.agenting import httpClient
 from keri.app.cli.common import existing
 from keri.app.cli.common.parsing import Parsery
@@ -53,7 +53,7 @@ class AuthDoer(doing.DoDoer):
     def __init__(self, name, alias, base, bran, witness, urlOnly):
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hab = self.hby.habByName(alias)
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
         self.urlOnly = urlOnly
 
         if witness in self.hby.kevers:

src/keri/app/oobiing.py

@@ -19,7 +19,7 @@
 from .. import help
 from .. import kering
 from ..kering import Vrsn_1_0, Vrsn_2_0
-from ..app import connecting
+from ..app import organizing
 from ..core import routing, eventing, parsing, scheming, serdering
 from ..db import basing
 from ..end import ending
@@ -291,7 +291,7 @@ def __init__(self, hby, rvy=None, clienter=None, cues=None):
             self.registerReplyRoutes(self.rvy.rtr)
 
         self.clienter = clienter or httping.Clienter()
-        self.org = connecting.Organizer(hby=self.hby)
+        self.org = organizing.Organizer(hby=self.hby)
 
         # Set up a local parser for returned events from OOBI queries.
         rtr = routing.Router()