cubicweb: comparison dbapi.py

equal deleted inserted replaced

-:8af7c6d86efb
+:a964c40adbe3
 """some monkey patching necessary when an application has to deal with
 several connections to different repositories. It tries to hide buggy class
 attributes since classes are not designed to be shared among multiple
 registries.
 """
-defaultcls = cwvreg.VRegistry.REGISTRY_FACTORY[None]
+defaultcls = cwvreg.CWRegistryStore.REGISTRY_FACTORY[None]
-etypescls = cwvreg.VRegistry.REGISTRY_FACTORY['etypes']
+etypescls = cwvreg.CWRegistryStore.REGISTRY_FACTORY['etypes']
 orig_etype_class = etypescls.orig_etype_class = etypescls.etype_class
 @monkeypatch(defaultcls)
 def etype_class(self, etype):
 """return an entity class for the given entity type.
 Try to find out a specific class for this kind of entity or
 return usercls
 usercls.e_schema = self.schema.eschema(etype)
 return usercls
 def multiple_connections_unfix():
-etypescls = cwvreg.VRegistry.REGISTRY_FACTORY['etypes']
+etypescls = cwvreg.CWRegistryStore.REGISTRY_FACTORY['etypes']
 etypescls.etype_class = etypescls.orig_etype_class
 class ConnectionProperties(object):
 def __init__(self, cnxtype=None, lang=None, close=True, log=False):
 """get a proxy object to the CubicWeb repository, using a specific RPC method.
 Only 'in-memory' and 'pyro' are supported for now. Either vreg or config
 argument should be given
 """
-assert method in ('pyro', 'inmemory')
+assert method in ('pyro', 'inmemory', 'zmq')
 assert vreg or config
 if vreg and not config:
 config = vreg.config
 if method == 'inmemory':
 # get local access to the repository
 from cubicweb.server.repository import Repository
-return Repository(config, vreg=vreg)
+from cubicweb.server.utils import TasksManager
+return Repository(config, TasksManager(), vreg=vreg)
+elif method == 'zmq':
+from cubicweb.zmqclient import ZMQRepositoryClient
+return ZMQRepositoryClient(config, vreg=vreg)
 else: # method == 'pyro'
 # resolve the Pyro object
 from logilab.common.pyro_ext import ns_get_proxy, get_proxy
 pyroid = database or config['pyro-instance-id'] or config.appid
 try:
 :login:
 the user login to use to authenticate.
 :host:
-the pyro nameserver host. Will be detected using broadcast query if
+- pyro: nameserver host. Will be detected using broadcast query if unspecified
-unspecified.
+- zmq: repository host socket address
 :group:
 the instance's pyro nameserver group. You don't have to specify it unless
 tweaked in instance's configuration.
 config = cwconfig.CubicWebNoAppConfiguration()
 if host:
 config.global_set_option('pyro-ns-host', host)
 if group:
 config.global_set_option('pyro-ns-group', group)
+elif method == 'zmq':
+config = cwconfig.CubicWebNoAppConfiguration()
 else:
 assert database
 config = cwconfig.instance_configuration(database)
 repo = get_repository(method, database, config=config)
 if method == 'inmemory':
 vreg = repo.vreg
 elif setvreg:
 if mulcnx:
 multiple_connections_fix()
-vreg = cwvreg.CubicWebVRegistry(config, initlog=initlog)
+vreg = cwvreg.CWRegistryStore(config, initlog=initlog)
 schema = repo.get_schema()
 for oldetype, newetype in ETYPE_NAME_MAP.items():
 if oldetype in schema:
 print 'aliasing', newetype, 'to', oldetype
 schema._entities[newetype] = schema._entities[oldetype]
 cnx.vreg = vreg
 return cnx
 def in_memory_repo(config):
 """Return and in_memory Repository object from a config (or vreg)"""
-if isinstance(config, cwvreg.CubicWebVRegistry):
+if isinstance(config, cwvreg.CWRegistryStore):
 vreg = config
 config = None
 else:
 vreg = None
 # get local access to the repository
 class DBAPIRequest(RequestSessionBase):
 def __init__(self, vreg, session=None):
 super(DBAPIRequest, self).__init__(vreg)
+#: 'language' => translation_function() mapping
 try:
 # no vreg or config which doesn't handle translations
 self.translations = vreg.config.translations
 except AttributeError:
 self.translations = {}
+#: Request language identifier eg: 'en'
+self.lang = None
 self.set_default_language(vreg)
-# cache entities built during the request
+#: cache entities built during the request
 self._eid_cache = {}
 if session is not None:
 self.set_session(session)
 else:
 # these args are initialized after a connection is
 # this occurs usually during test execution
 self._ = self.__ = unicode
 self.pgettext = lambda x, y: unicode(y)
 self.debug('request default language: %s', self.lang)
+# server-side service call #################################################
+def call_service(self, regid, async=False, **kwargs):
+return self.cnx.call_service(regid, async, **kwargs)
 # entities cache management ###############################################
 def entity_cache(self, eid):
 return self._eid_cache[eid]
 if self._closed is None and self._close_on_del:
 try:
 self.close()
 except Exception:
 pass
+# server-side service call #################################################
+@check_not_closed
+def call_service(self, regid, async=False, **kwargs):
+return self._repo.call_service(self.sessionid, regid, async, **kwargs)
 # connection initialization methods ########################################
 def load_appobjects(self, cubes=_MARKER, subpath=None, expand=True):
 config = self.vreg.config

branch	stable
changeset 8463	a964c40adbe3
parent 8404	3dcb117fb3b0
child 8537	e30d0a7f0087
child 8571	7e5246889148