Changeset 127

Timestamp:

05/02/08 17:22:17 (4 years ago)

Author:

phil

Message:

This update to rdfalchemy moves some functions in to a sub-module and has the beginings of a sparql script
It adds some unit tests (for initBinding)

Breaking your Programs:

This update could break your code if you:

from rdfalchemy.sesame2 import SesameGraph?

you now need to import from rdfalchemy.sparql.sesame2
allows for jython or other sesame graph implimentations not dependent on the http sparql endpoint

you should probably be using create_engine instead

Location:

rdfalchemy/trunk

Files:

• rdfalchemy/descriptors.py (modified) (3 diffs)
• rdfalchemy/engine/__init__.py (modified) (1 diff)
• rdfalchemy/__init__.py (modified) (1 diff)
• rdfalchemy/Literal.py (modified) (1 diff)
• rdfalchemy/orm.py (modified) (1 diff)
• rdfalchemy/rdfSubject.py (modified) (2 diffs)
• rdfalchemy/sparql (added)
• rdfalchemy/sparql/__init__.py (added)
• rdfalchemy/sparql/parsers.py (added)
• rdfalchemy/sparql.py (deleted)
• rdfalchemy/sparql/script.py (added)
• rdfalchemy/sparql/sesame2.py (added)
• test/sesame2_perf.py (modified) (1 diff)
• test/sesame2_test.py (modified) (1 diff)
• test/sparql_test.py (added)

rdfalchemy/trunk/rdfalchemy/descriptors.py

@@ -8 +8 @@
 """
 
-from rdflib import URIRef, BNode, Namespace, RDF
+from rdflib import URIRef, BNode, Namespace
 from rdflib.Identifier import Identifier 
 from rdfalchemy import rdfSubject, Literal 
@@ -14 +14 @@
 
 import logging
+
+__all__=["rdfSingle","rdfMultiple","rdfList","rdfContainer"]
+
 #console = logging.StreamHandler()
 #formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
 #console.setFormatter(formatter)
-
 log=logging.getLogger(__name__)
 #log.setLevel(logging.DEBUG)
@@ -297 +299 @@
             first=obj.db.value(base, RDF['_%d'%i])
 
-        val=[((isinstance(v,BNode) or isinstance(v,URIRef)) and self.range_class(v) or v.toPython()) for v in members]
+        val=[(isinstance(v,(BNode,URIRef)) and self.range_class(v) or v.toPython()) for v in members]
         obj.__dict__[self.name] = val
         return val

rdfalchemy/trunk/rdfalchemy/engine/__init__.py

@@ -63 +63 @@
         db=root['rdflib']
     elif url.lower().startswith('sesame://'):
-        from rdfalchemy.sesame2 import SesameGraph
+        from rdfalchemy.sparql.sesame2 import SesameGraph
         db = SesameGraph("http://"+url[9:])
     elif url.lower().startswith('sparql://'):

rdfalchemy/trunk/rdfalchemy/__init__.py

@@ -1 @@
-from rdflib import Namespace
+from rdflib import URIRef, BNode, Namespace, RDF
 from rdfalchemy.Literal import Literal
 from rdfalchemy.rdfSubject import rdfSubject

rdfalchemy/trunk/rdfalchemy/Literal.py

@@ -16 +16 @@
 
 ################################################################################
-# Let's fix the logging.  this seems like a log of work...
-# all that it does is not log rebinding errors 
-# We know about them ... and they confuse type citizenry
+# Let's fix the logging.  This seems like a lot of work...
+# all that it does is not log rebinding errors. 
+# We know already about them ... and the warnings confuse the citizenry.
 _log = logging.getLogger("rdflib")
 if not _log.handlers:

rdfalchemy/trunk/rdfalchemy/orm.py

@@ -44 +44 @@
 #def mapBase(baseclass):
 #    """This maps all classes below baseclass as in mapper()
-#    AND puts the dict of {rdf_type: mapped_class}  in an baseclass.type2class attribute"""
-#    baseclass.type2class = mapper(allsub(baseclass))
+#    AND puts the dict of {rdf_type: mapped_class}  in an baseclass._type2class attribute"""
+#    baseclass._type2class = mapper(*allsub(baseclass))
     

rdfalchemy/trunk/rdfalchemy/rdfSubject.py

@@ -54 +54 @@
         """The constructor tries hard to do return you an rdfSubject
 
-        :param resUri: the *resource uri* can be one of
+        :param resUri: the "resource uri". If `None` then create an instance with a BNode resUri.
+        Can be given as one of
 
            * an instance of an rdfSubject
@@ -61 +62 @@
            * an n3 bnode string like: "_:xyz1234" 
         
-        :param resUri: if None then create an instance with a BNode resUri
         :param kwargs: is a set of values that will be set using the keys to find the appropriate descriptor"""
         

rdfalchemy/trunk/test/sesame2_perf.py

@@ -1 +1 @@
 from datetime import datetime
-from rdfalchemy.sesame2 import SesameGraph
+from rdfalchemy.sparql.sesame2 import SesameGraph
 
 import logging 

rdfalchemy/trunk/test/sesame2_test.py

@@ -1 @@
-from rdfalchemy.sesame2 import SesameGraph
+from rdfalchemy.sparql.sesame2 import SesameGraph
 
 url = 'http://www.openvest.com:8080/openrdf-sesame/repositories/Portfolio/'