namespace-intersection defined; stubbing autonomy readout for agent-d…

…erived objs

lib/cortex/services/web/__init__.py

@@ -19,7 +19,7 @@
 from .eventdemo import rootpage
 from cortex.mixins import LocalQueue
 
-class Web(Service, LocalQueue):
+class Web(LocalQueue, Service):
     """ Stub Service:
         start: brief description of service start-up here
         stop:  brief description service shutdown here
@@ -67,7 +67,7 @@ def start(self):
         self.universe.reactor.callWhenRunning(go)
         Service.start(self)
 
-    def run(self):
+    def asdrun(self):
         """ see docs for ThreadedIterator """
         while self.started:
             self.iterate()
@@ -77,9 +77,9 @@ def _post_init(self, **kargs):
         """ initialize the local queue """
         self.init_q()
 
-    def iterate(self):
+    def asdfiterate(self):
         """ """
-        #report('iterating')
+        report('iterating')
         return
         e = self.pop_q()
         if not e:

lib/cortex/services/web/resource/__init__.py

@@ -68,7 +68,9 @@ def template(self):
         else:
             ctx.update(source=get_source(self.target))
             if isinstance(self.target, Agent):
+                from cortex.mixins.autonomy import Autonomy
                 T = template('objects/agent')
+                ctx.update(autonomy=NSPart(self.target).intersection(NSPart(Autonomy)))
             elif self.target == Universe:
                 T = template('objects/universe')
             elif isinstance(self.target, types.MethodType):

lib/cortex/services/web/templates/objects/agent.html

@@ -2,7 +2,12 @@
 
 
 {%block page_title%}{{obj_name}}{%endblock%}
-{%block obj_type%}AGENT{%endblock%}
+{%block obj_type%}AGENT(base)){%endblock%}
+
+{%block obj_nav%}
+<a href="javascript:$('#autonomy').toggle()">Autonomy Aspect</a>
+{{super()}}
+{%endblock%}
 
 {%block obj_namespace%}
   {{super()}}
@@ -15,3 +20,19 @@
     {% with namespace=data%}{%include "objects/_namespace.html"%}{%endwith%}
   </td>
 {%endblock%}
+
+
+  {%block obj_main%}
+  <table>
+    <tr>
+      <td>agent etc
+    </td></tr>
+    <tr class=hidden id=autonomy>
+    <td>
+      <strong>Autonomy:</strong>
+      {% with namespace=autonomy%}{%include "objects/_namespace.html"%}{%endwith%}
+    </td>
+    </tr>
+  </table>
+  {{super()}}
+{%endblock%}

lib/cortex/util/namespaces.py

@@ -212,6 +212,15 @@ def subclasses_of(self, thing, strict=True):
         test = lambda obj: issubclass(obj,kls)
         return self.generic(test)
 
+    def intersection(self, other):
+        if isinstance(other, (dict,NSPart)):
+            other = getattr(other, 'namespace', other)
+            result = [ [k,self[k]] for k in self.namespace if k in other]
+        else:
+            raise RuntimeError,'niy'
+        result = dict(result)
+        return result if self.dictionaries else self.__class__(result)
+
 # Begin aliases, shortcuts
 ################################################################################
 NSPart = NamespacePartitioner = NamespacePartition