From f14a5114d0cf6673c172bdb89669fa80efcd3f2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Tue, 7 May 2013 10:39:01 +0200 Subject: [PATCH] wip --- manifold/manifoldapi.py | 7 +- manifold/manifoldproxy.py | 3 +- manifold/metadata.py | 9 +- trash/sliceview.py | 298 +++++++++++++++++++++++++------------- unfold/composite.py | 2 +- 5 files changed, 213 insertions(+), 106 deletions(-) diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py index 6037f98b..c0870eca 100644 --- a/manifold/manifoldapi.py +++ b/manifold/manifoldapi.py @@ -41,7 +41,12 @@ class ManifoldAPI: ### attempt to cope with old APIs and new APIs if isinstance (result, dict) and 'code' in result: # this sounds like a result from a new API, leave it untouched - return result # jordan + # XXX jordan : we need to wrap it into a ResultValue structure + # XXX this is not good until we merge both repos + if result['code'] != 2: + return ManifoldResult(code=result['code'], value=result['result']) + else: + return ManifoldResult(code=result['code'], output=result['description']) else: if debug: print '<=== backend call', methodName, args, kwds diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py index 29239b5d..eaa128b5 100644 --- a/manifold/manifoldproxy.py +++ b/manifold/manifoldproxy.py @@ -75,12 +75,13 @@ with the query passed using POST""" answer=manifold_api.send_manifold_query (manifold_query) print "="*80 print "ANSWER IN PROXY", answer + print answer.ok_value() print "="*80 if debug: print '<=== manifoldproxy.proxy: received from backend with code', answer['code'] if answer['code']==0: print ".... ctd ", - value=answer['result'] # was: value + value=answer.ok_value() if isinstance (value, list): print "result is a list with %d entries"%len(value) elif isinstance (value, dict): print "result is a dict with keys %s"%value.keys() else: print "result is other (type=%s) : %s"%(type(value),value) diff --git a/manifold/metadata.py b/manifold/metadata.py index 5f287ec9..eb0e48a4 100644 --- a/manifold/metadata.py +++ b/manifold/metadata.py @@ -16,6 +16,9 @@ class MetaData: self.auth=auth self.hash_by_subject={} + # XXX Retrieve all metadata the first time we instanciate the class + self.fetch() + def fetch (self): offline_filename="offline-metadata.json" if work_offline: @@ -32,7 +35,10 @@ class MetaData: 'column.resource_type', 'column.value_type', 'column.allowed_values', 'column.platforms.platform', 'column.platforms.platform_url'] - rows_result = manifold_api.Get(fact_table='metadata:table', fields=fields) + rows_result = manifold_api.Get({ + 'fact_table': 'local:objects', # proposed to replace metadata:table + 'fields': fields + }) #old# rows_result = manifold_api.Get('metadata:table', [], [], fields) rows = rows_result.ok_value() if not rows: @@ -52,4 +58,3 @@ class MetaData: def sorted_fields_by_subject (self, subject): return self.hash_by_subject[subject]['columns'].sort() - diff --git a/trash/sliceview.py b/trash/sliceview.py index 8f8a8bab..ee030451 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -6,7 +6,8 @@ from django.shortcuts import render_to_response from django.contrib.auth.decorators import login_required from unfold.page import Page -from manifold.manifoldquery import ManifoldQuery +#from manifold.manifoldquery import ManifoldQuery +from manifold.core.query import Query, AnalyzedQuery from plugins.raw.raw import Raw from plugins.stack.stack import Stack @@ -23,126 +24,221 @@ from myslice.viewutils import quickfilter_criterias from myslice.viewutils import topmenu_items, the_user +# XXX JORDAN +from manifold.metadata import MetaData as Metadata + tmp_default_slice='ple.inria.heartbeat' +debug = True @login_required def slice_view (request, slicename=tmp_default_slice): page = Page(request) - main_query = ManifoldQuery (action='get', - subject='resource', - timestamp='latest', - fields=['network','type','hrn','hostname'], - filters= [ [ 'slice_hrn', '=', slicename, ] ], - ) - page.enqueue_query (main_query) + # TODO The query to run is embedded in the URL + main_query = Query({'action': 'get', 'object': 'slice'}).filter_by('slice_hrn', '=', slicename) + + # Get default fields from metadata unless specified + if not main_query.fields: + md_fields = page.get_metadata() + md_fields = md_fields.details_by_subject('slice') + if debug: + print "METADATA", md_fields + # TODO Get default fields + main_query.fields = ['slice_hrn', 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.authority'] + +#old# main_query = ManifoldQuery (action='get', +#old# subject='resource', +#old# timestamp='latest', +#old# fields=['network','type','hrn','hostname'], +#old# filters= [ [ 'slice_hrn', '=', slicename, ] ], +#old# ) + page.enqueue_query(main_query) + # Prepare the display according to all metadata + # (some parts will be pending, others can be triggered by users). + # + # For example slice measurements will not be requested by default... + + # Create the base layout (Stack)... main_plugin = Stack ( page=page, title="Slice view for %s"%slicename, domid='thestack', togglable=False, sons=[ - Raw (page=page,togglable=False, toggled=True,html="

Slice page for %s

"%slicename), Messages ( page=page, title="Runtime messages for slice %s"%slicename, domid="msgs-pre", levels="ALL", ), - Tabs ( - page=page, - title="2 tabs : w/ and w/o checkboxes", - domid='thetabs', - # active_domid='checkboxes', - active_domid='gmap', - sons=[ - Hazelnut ( - page=page, - title='a sample and simple hazelnut', - domid='simple', - # tab's sons preferably turn this off - togglable=False, - # this is the query at the core of the slice list - query=main_query, - ), - Hazelnut ( - page=page, - title='with checkboxes', - domid='checkboxes', - # tab's sons preferably turn this off - togglable=False, - # this is the query at the core of the slice list - query=main_query, - checkboxes=True, - datatables_options = { - # for now we turn off sorting on the checkboxes columns this way - # this of course should be automatic in hazelnut - 'aoColumns' : [ None, None, None, None, {'bSortable': False} ], - 'iDisplayLength' : 25, - 'bLengthChange' : True, - }, - ), - GoogleMap ( - page=page, - title='geographic view', - domid='gmap', - # tab's sons preferably turn this off - togglable=False, - query=main_query, - # center on Paris - latitude=49., - longitude=2.2, - zoom=3, - ), - Raw ( -# SensLabMap ( - page=page, - title='3D view (disabled)', - domid='smap', -# # tab's sons preferably turn this off - togglable=False, -# query=main_query, - html="""

-Thierry: I am commeting off the use of which, - although rudimentarily ported to the django framework, -causes a weird behaviour especially wrt scrolling. -On my Mac any longer -if I keep this active, so for now it's disabled -

""", - ), - ]), - Hazelnut ( - page=page, - title='a hazelnut not in tabs', - domid='standalone', - # this is the query at the core of the slice list - query=main_query, - columns=['hrn','hostname'], - ), - # you don't *have to* set a domid, but if you plan on using toggled=persistent then it's required - # because domid is the key for storing toggle status in the browser - QueryCode ( - page=page, - title='xmlrpc code (toggled=False)', - query=main_query, -# domid='xmlrpc', - toggled=False, - ), - QuickFilter ( - page=page, - title="QuickFilter - requires metadata (toggled=False)", - criterias=quickfilter_criterias, - domid='filters', - toggled=False, - ), - Messages ( - page=page, - title="Runtime messages (again)", - domid="msgs-post", - ) - ]) + Raw (page=page,togglable=False, toggled=True,html="

Slice page for %s

"%slicename), + ] + ) + + # ... responsible for the slice properties... + + main_plugin.insert( + Raw (page=page,togglable=False, toggled=True,html='Description: TODO') + ) + + + # ... and for the relations + # XXX Let's hardcode resources for now + aq = AnalyzedQuery(main_query) + sq = aq.subquery('resource') + + tab_resources = Tabs ( + page = page, + title = 'Resources', + domid = 'thetabs', + # activeid = 'checkboxes', + active_domid = 'gmap', + ) + main_plugin.insert(tab_resources) + + tab_resources.insert( + Hazelnut ( + page = page, + title = 'List', + domid = 'checkboxes', + # tab's sons preferably turn this off + togglable = False, + # this is the query at the core of the slice list + query = sq, + checkboxes = True, + datatables_options = { + # for now we turn off sorting on the checkboxes columns this way + # this of course should be automatic in hazelnut + 'aoColumns' : [None, None, None, None, {'bSortable': False}], + 'iDisplayLength' : 25, + 'bLengthChange' : True, + }, + ) + ) + tab_resources.insert( + GoogleMap ( + page = page, + title = 'Geographic view', + domid = 'gmap', + # tab's sons preferably turn this off + togglable = False, + query = sq, + # center on Paris + latitude = 49., + longitude = 2.2, + zoom = 3, + ) + ) + + # END OF JORDAN's CODE + +#old# main_plugin = Stack ( +#old# page=page, +#old# title="Slice view for %s"%slicename, +#old# domid='thestack', +#old# togglable=False, +#old# sons=[ +#old# Raw (page=page,togglable=False, toggled=True,html="

Slice page for %s

"%slicename), +#old# Messages ( +#old# page=page, +#old# title="Runtime messages for slice %s"%slicename, +#old# domid="msgs-pre", +#old# levels="ALL", +#old# ), +#old# Tabs ( +#old# page=page, +#old# title="2 tabs : w/ and w/o checkboxes", +#old# domid='thetabs', +#old# # active_domid='checkboxes', +#old# active_domid='gmap', +#old# sons=[ +#old# Hazelnut ( +#old# page=page, +#old# title='a sample and simple hazelnut', +#old# domid='simple', +#old# # tab's sons preferably turn this off +#old# togglable=False, +#old# # this is the query at the core of the slice list +#old# query=main_query, +#old# ), +#old# Hazelnut ( +#old# page=page, +#old# title='with checkboxes', +#old# domid='checkboxes', +#old# # tab's sons preferably turn this off +#old# togglable=False, +#old# # this is the query at the core of the slice list +#old# query=main_query, +#old# checkboxes=True, +#old# datatables_options = { +#old# # for now we turn off sorting on the checkboxes columns this way +#old# # this of course should be automatic in hazelnut +#old# 'aoColumns' : [ None, None, None, None, {'bSortable': False} ], +#old# 'iDisplayLength' : 25, +#old# 'bLengthChange' : True, +#old# }, +#old# ), +#old# GoogleMap ( +#old# page=page, +#old# title='geographic view', +#old# domid='gmap', +#old# # tab's sons preferably turn this off +#old# togglable=False, +#old# query=main_query, +#old# # center on Paris +#old# latitude=49., +#old# longitude=2.2, +#old# zoom=3, +#old# ), +#old# Raw ( +#old## SensLabMap ( +#old# page=page, +#old# title='3D view (disabled)', +#old# domid='smap', +#old## # tab's sons preferably turn this off +#old# togglable=False, +#old## query=main_query, +#old# html="""

+#old#Thierry: I am commeting off the use of which, +#old# although rudimentarily ported to the django framework, +#old#causes a weird behaviour especially wrt scrolling. +#old#On my Mac any longer +#old#if I keep this active, so for now it's disabled +#old#

""", +#old# ), +#old# ]), +#old# Hazelnut ( +#old# page=page, +#old# title='a hazelnut not in tabs', +#old# domid='standalone', +#old# # this is the query at the core of the slice list +#old# query=main_query, +#old# columns=['hrn','hostname'], +#old# ), +#old# # you don't *have to* set a domid, but if you plan on using toggled=persistent then it's required +#old# # because domid is the key for storing toggle status in the browser +#old# QueryCode ( +#old# page=page, +#old# title='xmlrpc code (toggled=False)', +#old# query=main_query, +#old## domid='xmlrpc', +#old# toggled=False, +#old# ), +#old# QuickFilter ( +#old# page=page, +#old# title="QuickFilter - requires metadata (toggled=False)", +#old# criterias=quickfilter_criterias, +#old# domid='filters', +#old# toggled=False, +#old# ), +#old# Messages ( +#old# page=page, +#old# title="Runtime messages (again)", +#old# domid="msgs-post", +#old# ) +#old# ]) # variables that will get passed to the view-unfold1.html template template_env = {} diff --git a/unfold/composite.py b/unfold/composite.py index ffa6de98..9007cdc6 100644 --- a/unfold/composite.py +++ b/unfold/composite.py @@ -4,7 +4,7 @@ from unfold.plugin import Plugin # sons is expected to be a list of the contained plugins, and # active_domid is the domid for the one son that should be displayed as active # some subclasses of Composite, like e.g. Tabs, will not behave as expected -# if a valid active_domid is not be provided +# if a valid active_domid is not provided class Composite (Plugin): -- 2.43.0