Changeset 206

Timestamp:

09/14/08 19:39:10 (4 months ago)

Author:

rgrp

Message:

[factlet/new][l]: implement factlet creation from a wikipedia url in WUI.

• dbpedia:
  
  • put in tests for to_factlet and fix issues with that.
    
  • fix up verbose support in Describe
    
• factlet: support for factlet creation from a wikipedia url + test.
  

Files:

• trunk/microfacts/controllers/factlet.py (modified) (3 diffs)
• trunk/microfacts/getdata/dbpedia.py (modified) (7 diffs)
• trunk/microfacts/lib/cli.py (modified) (2 diffs)
• trunk/microfacts/model/__init__.py (modified) (1 diff)
• trunk/microfacts/templates/factlet/layout.html (modified) (1 diff)
• trunk/microfacts/templates/factlet/new.html (modified) (2 diffs)
• trunk/microfacts/tests/functional/test_factlet.py (modified) (2 diffs)
• trunk/microfacts/tests/getdata/test_dbpedia.py (modified) (3 diffs)

trunk/microfacts/controllers/factlet.py

@@ +1 @@
+import logging
-import simplejson as sj
-import genshi
+
+logging.getLogger(__name__)
-
-from microfacts.lib.base import *
-from microfacts.modes import *
-import microfacts.lib.json
+
+# not everyone will have the libraries installed for working with dbpedia
+dbpedia_enabled = True
+try:
+    from microfacts.getdata.dbpedia import *
+except:
+    dbpedia_enabled = False
-
-class FactletController(BaseController):
@@ -34 +44 @@
-
-    def new(self):
-
+
+
+
-
-
-
+
+
+
+
-            registry_path = '/factlet'
-            entity_data = {
@@ -50 +64 @@
-                h.redirect_to(controller='factlet', action='update',
-                        id=c.factlet.id)
-
+ # this should really tell the user what was wrong
-                abort(self.mode.response_code)
+        elif url:
+            logger.debug('Creating new factlet from url: %s' % url)
+            # TODO: check dbpedia_enabled is True?
+            d = microfacts.getdata.dbpedia.Describe()
+            d.execute(url)
+            try:
+                c.factlet = d.to_factlet()
+            except Exception, inst:
+                c.error = str(inst)
+                return render('factlet/new')
+            h.redirect_to(controller='factlet', action='update',
+                    id=c.factlet.id)
-        else:
+            # Error?
+            # c.error = 'No title or url supplied'
-            return render('factlet/new')
+
-
-    def read_core(self, id):

trunk/microfacts/getdata/dbpedia.py

@@ -75 +75 @@
-class Describe:
-
-
+, verbose=False
-        self.results = []
-Fal
+verbo
-        self.language = 'en'
-
-    def execute(self, uri):
+        if 'wikipedia.org' in uri:
+            uri = self._convert_wikipedia_url(uri)
-        self.uri = uri
-        query2 = PREFIXES + '''
@@ -93 +95 @@
-        # print self.results.all_nodes()
-
-
+
+
+
+
+
+
+
+
-        output = self.uri + '\n\n'
-
+self.
-            for s,p,o in self.results:
-                output += u'%s, %s, %s\n' % (s,p,o)
@@ -109 +118 @@
-        kwds = { 'title' : None,
-                'description' : None,
-None
-None
+''
+''
-                'source': None,
-                'place': [],
-                'long': None,
-                'lat': None,
-
-
-
+
+
-                }
-        for s,p,o in self.results:
@@ -159 +167 @@
-                kwds['source'] = unicode(o)
-            elif str(p) == 'http://xmlns.com/foaf/0.1/img':
-'] = kwds['image
+_urls'] = kwds['image_urls
-
-        # get lat/long indirectly ...
@@ -177 +185 @@
-                    # once we have one set we don't need any more ...
-                    break
-        kwds['location']['coordinates'][0] = kwds['long']
-        kwds['location']['coordinates'][1] = kwds['lat']
-        return kwds 
-
@@ -214 +220 @@
-                    raise ValueError('%s is not a useable date object' % o)
-        except Exception, inst:
-
-
-
-
-
+
+
+
+
+
+
-        return dates
-
@@ -228 +235 @@
-        from microfacts.lib.json import FactletConverter
-        conv = FactletConverter()
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-def describe(uri, verbose=False):
-
+verbose
-    d.execute(uri)
-verbose=verbose
+
-
-

trunk/microfacts/lib/cli.py

@@ -111 +111 @@
-    describe <uri>
-    search <category-name>
-    wp <wikipedia-url>
-    
-Examples:
-
-    describe http://dbpedia.org/resource/Admiralty_Islands_campaign
+    describe http://en.wikipedia.org/wiki/Napoleon_I_of_France
-    search Category:Battles_and_operations_of_World_War_II
-    wp http://en.wikipedia.org/wiki/Napoleon_I_of_France
-    '''
-    summary = __doc__.split('\n')[0]
@@ -141 +140 @@
-            category = self.args[1]
-            result = dbp.category_search(category)
-        elif cmd == 'wp':
-            import urlparse
-            url = self.args[1]
-            path = urlparse.urlparse(url)[2]
-            name = path.split('/')[-1]
-            dbpedia_uri = 'http://dbpedia.org/resource/' + name
-            result = dbp.describe(dbpedia_uri, verbose=self.verbose)
-        else:
-            msg = 'Command %s not recognized' % cmd

trunk/microfacts/model/__init__.py

@@ -186 +186 @@
-
-mapper(User, user_table, properties={
-
-
+
+
+
+
+
+
+
-    })

trunk/microfacts/templates/factlet/layout.html

@@ -23 +23 @@
-          <li>${h.link_to('Home', h.url_for(controller='factlet', action='index', id=None))}</li>
-          <li>${h.link_to('List', h.url_for(controller='factlet', action='list', id=None))}</li>
-New', h.url_for(controller='factlet', action='create
+Create', h.url_for(controller='factlet', action='new
-        </ul>
-      </aside>

trunk/microfacts/templates/factlet/new.html

@@ -1 @@
-<!DOCTYPE html>
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
@@ -10 +9 @@
-
-  <head>
-New
+Create
-  </head>
-
-  <body>
-
-
-
+
+
+
+
-      <label for="title">Title:</label>
-      ${XML(h.text_field('title', size=30))}
-      <br /><br />
+
+      <div py:strip="True" py:if="c.dbpedia_enabled">
+
+      <p><strong>OR</strong> enter a Wikipedia (or DBPedia) url:</p>
+      <label for="url">Url:</label>
+      ${XML(h.text_field('url', size=30))}
+
+      <p class="desc">The factlet will be generated from the information in that
+      article.</p>
+      </div>
+
-      ${XML(h.submit('Create new factlet'))}
-    </form>

trunk/microfacts/tests/functional/test_factlet.py

@@ -166 +166 @@
-        form = response.forms[0]
-        form['title'] = self.title
-
+
+
+
-        response = response.follow()
-        assert 'Factlets - Edit' in response, response
@@ -172 +174 @@
-        assert self.ft
-
+import microfacts.controllers.factlet
+class TestFactletCreateViaWikipedia(TestController):
+
+    # nose attributes
+    __test__ = microfacts.controllers.factlet.dbpedia_enabled
+    external = True
+    tags = [ 'dbpedia' ]
+
+    title = u'Philip II of Spain'
+    url = u'http://en.wikipedia.org/wiki/Philip_II_of_Spain'
+
+    def tearDown(self):
+        ft = model.Factlet.query.filter_by(source=self.url).one()
+        ft.delete()
+        model.Session.flush()
+        model.Session.remove()
+
+    def test_create(self):
+        path = url_for(controller='factlet', action='new')
+        response = self.app.get(path)
+        assert 'enter a Wikipedia (or DBPedia resouce) url:'
+        form = response.forms[0]
+        form['url'] = self.url
+        response = form.submit('commit', status=[302])
+        response = response.follow()
+        assert 'Factlets - Edit' in response, response
+        self.ft = model.Factlet.query.filter_by(source=self.url).one()
+        assert self.ft.title == self.title
+        # May 21, 1527 (1527-05-21)
+        assert self.ft.start.year == 1527
+

trunk/microfacts/tests/getdata/test_dbpedia.py

@@ -1 +1 @@
-# not everyone will have the libraries installed for working with dbpedia
+dotest = True
-try:
-    from microfacts.getdata.dbpedia import *
-except:
-pass
+dotest = False
-
-
-
+
+
+
+
+
+
-
-    def test_extract_1(self):
@@ -30 +35 @@
-        assert kwds['title'] == u'Invasion of Normandy'
-
-
-
+
-
-    @classmethod
-    def setup_class(self):
-        uri3 = 'http://dbpedia.org/resource/Battle_of_Austerlitz'
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def test_date(self):
-datetime.datetime(1805, 12, 2)
+self.start 
-
-    def test_source(self):
@@ -50 +64 @@
-        assert self.kwds['long'] == 16.76361083984375
-
+    def test_to_factlet(self):
+        self.fct = self.d.to_factlet()
+        assert self.fct.id
+        long = round(self.fct.location.x,1)
+        assert long == 16.8, long
+        assert self.fct.start == self.start
+
+
+class TestDescribeWikipedia(DbpediaBase):
+
+    uri = 'http://en.wikipedia.org/wiki/Battle_of_Austerlitz'
+
+    def test__convert_wikipedia_url(self):
+        d = Describe()
+        out = d._convert_wikipedia_url(self.uri)
+        assert out == 'http://dbpedia.org/resource/Battle_of_Austerlitz', out
+    
+    def test_1(self):
+        d = Describe()
+        d.execute(self.uri)
+        self.kwds = d.extract()
+        assert self.kwds['title'] == 'Battle of Austerlitz'
+        assert self.kwds['source'] == self.uri
+