From 4ea7f6be6955285c746e451a21162f70d2cbe58b Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 2 Mar 2012 17:32:13 -0500 Subject: [PATCH] remove sqlalchemy dependency from sfi --- sfa/client/sfi.py | 12 +++--- sfa/storage/model.py | 92 +++----------------------------------------- 2 files changed, 12 insertions(+), 92 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 47d94c79..317c19d5 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -29,7 +29,7 @@ from sfa.util.config import Config from sfa.util.version import version_core from sfa.util.cache import Cache -from sfa.storage.model import make_record +from sfa.storage.record import Record from sfa.rspecs.rspec import RSpec from sfa.rspecs.rspec_converter import RSpecConverter @@ -132,14 +132,14 @@ def save_records_to_file(filename, record_dicts, format="xml"): f = open(filename, "w") f.write("\n") for record_dict in record_dicts: - record_obj=make_record (dict=record_dict) + record_obj=Record(dict=record_dict) f.write('\n') f.write("\n") f.close() elif format == "hrnlist": f = open(filename, "w") for record_dict in record_dicts: - record_obj=make_record (dict=record_dict) + record_obj=Record(dict=record_dict) f.write(record_obj.hrn + "\n") f.close() else: @@ -147,7 +147,7 @@ def save_records_to_file(filename, record_dicts, format="xml"): print "unknown output format", format def save_record_to_file(filename, record_dict): - rec_record = make_record (dict=record_dict) + rec_record = Record(dict=record_dict) str = record.save_to_string() f=codecs.open(filename, encoding='utf-8',mode="w") f.write(str) @@ -160,7 +160,7 @@ def load_record_from_file(filename): f=codecs.open(filename, encoding="utf-8", mode="r") xml_string = f.read() f.close() - return make_record (xml=xml_string) + return Record(xml=xml_string) import uuid @@ -716,7 +716,7 @@ or version information about sfi itself record_dicts = filter_records(options.type, record_dicts) if not record_dicts: self.logger.error("No record of type %s"% options.type) - records = [ make_record (dict=record_dict) for record_dict in record_dicts ] + records = [ Record(dict=record_dict) for record_dict in record_dicts ] for record in records: if (options.format == "text"): record.dump() else: print record.save_as_xml() diff --git a/sfa/storage/model.py b/sfa/storage/model.py index 702c182d..780853cc 100644 --- a/sfa/storage/model.py +++ b/sfa/storage/model.py @@ -9,6 +9,7 @@ from sqlalchemy.orm import object_mapper from sqlalchemy.orm import validates from sqlalchemy.ext.declarative import declarative_base +from sfa.storage.record import Record from sfa.util.sfalogging import logger from sfa.util.sfatime import utcparse, datetime_to_string from sfa.util.xml import XML @@ -46,99 +47,14 @@ Base=declarative_base() # (*) finally for converting a dictionary into an sqlalchemy object, we provide # obj.load_from_dict(dict) -class AlchemyObj: +class AlchemyObj(Record): def __iter__(self): self._i = iter(object_mapper(self).columns) return self def next(self): n = self._i.next().name return n, getattr(self, n) - def todict (self): - d=self.__dict__ - keys=[k for k in d.keys() if not k.startswith('_')] - return dict ( [ (k,d[k]) for k in keys ] ) - def load_from_dict (self, d): - for (k,v) in d.iteritems(): - # experimental - if isinstance(v, StringTypes) and v.lower() in ['true']: v=True - if isinstance(v, StringTypes) and v.lower() in ['false']: v=False - setattr(self,k,v) - def validate_datetime (self, key, incoming): - if isinstance (incoming, datetime): return incoming - elif isinstance (incoming, (int,float)):return datetime.fromtimestamp (incoming) - - # in addition we provide convenience for converting to and from xml records - # for this purpose only, we need the subclasses to define 'fields' as either - # a list or a dictionary - def xml_fields (self): - fields=self.fields - if isinstance(fields,dict): fields=fields.keys() - return fields - - def save_as_xml (self): - # xxx not sure about the scope here - input_dict = dict( [ (key, getattr(self.key), ) for key in self.xml_fields() if getattr(self,key,None) ] ) - xml_record=XML("") - xml_record.parse_dict (input_dict) - return xml_record.toxml() - - def dump(self, format=None, dump_parents=False): - if not format: - format = 'text' - else: - format = format.lower() - if format == 'text': - self.dump_text(dump_parents) - elif format == 'xml': - print self.save_to_string() - elif format == 'simple': - print self.dump_simple() - else: - raise Exception, "Invalid format %s" % format - - # xxx fixme - # turns out the date_created field is received by the client as a 'created' int - # (and 'last_updated' does not make it at all) - # let's be flexible - def date_repr (self,fields): - if not isinstance(fields,list): fields=[fields] - for field in fields: - value=getattr(self,field,None) - if isinstance (value,datetime): - return datetime_to_string (value) - elif isinstance (value,(int,float)): - return datetime_to_string(utcparse(value)) - # fallback - return "** undef_datetime **" - - def dump_text(self, dump_parents=False): - # print core fields in this order - core_fields = [ 'hrn', 'type', 'authority', 'date_created', 'created', 'last_updated', 'gid', ] - print "".join(['=' for i in range(40)]) - print "RECORD" - print " hrn:", self.hrn - print " type:", self.type - print " authority:", self.authority - print " date created:", self.date_repr( ['date_created','created'] ) - print " last updated:", self.date_repr('last_updated') - print " gid:" - print self.get_gid_object().dump_string(8, dump_parents) - - # print remaining fields - for attrib_name in dir(self): - attrib = getattr(self, attrib_name) - # skip internals - if attrib_name.startswith('_'): continue - # skip core fields - if attrib_name in core_fields: continue - # skip callables - if callable (attrib): continue - print " %s: %s" % (attrib_name, attrib) - - def dump_simple(self): - return "%s"%self - # # only intended for debugging # def inspect (self, logger, message=""): # logger.info("%s -- Inspecting AlchemyObj -- attrs"%message) @@ -204,6 +120,10 @@ class RegRecord (Base,AlchemyObj): elif isinstance(gid, StringTypes): return gid else: return gid.save_to_string(save_parents=True) + def validate_datetime (self, key, incoming): + if isinstance (incoming, datetime): return incoming + elif isinstance (incoming, (int,float)):return datetime.fromtimestamp (incoming) + @validates ('date_created') def validate_date_created (self, key, incoming): return self.validate_datetime (key, incoming) -- 2.43.0