From b6c09174ea80b2f550f8bf526d4e67fb844fc1e4 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Wed, 12 Jan 2022 10:30:38 +0100
Subject: [PATCH] Fixed issue with join
---
bob/db/utfvp/query.py | 352 ++++++++++++++++++++++--------------------
1 file changed, 182 insertions(+), 170 deletions(-)
diff --git a/bob/db/utfvp/query.py b/bob/db/utfvp/query.py
index e1844a4..d002118 100644
--- a/bob/db/utfvp/query.py
+++ b/bob/db/utfvp/query.py
@@ -14,248 +14,260 @@ SQLITE_FILE = Interface().files()[0]
class Database(bob.db.base.SQLiteDatabase):
- """The dataset class opens and maintains a connection opened to the Database.
+ """The dataset class opens and maintains a connection opened to the Database.
- It provides many different ways to probe for the characteristics of the data
- and for the data itself inside the database.
- """
-
-
- def __init__(self, original_directory=None, original_extension=None):
- super(Database, self).__init__(SQLITE_FILE, File,
- original_directory, original_extension)
-
-
- def protocol_names(self):
- """Returns a list of all supported protocols"""
-
- return tuple([k.name for k in self.query(Protocol).order_by(Protocol.name)])
-
-
- def purposes(self):
- """Returns a list of all supported purposes"""
-
- return Subset.purpose_choices
-
-
- def groups(self):
- """Returns a list of all supported groups"""
-
- return Subset.group_choices
+ It provides many different ways to probe for the characteristics of the data
+ and for the data itself inside the database.
+ """
+ def __init__(self, original_directory=None, original_extension=None):
+ super(Database, self).__init__(
+ SQLITE_FILE, File, original_directory, original_extension
+ )
- def genders(self):
- """Returns a list of all supported gender values"""
+ def protocol_names(self):
+ """Returns a list of all supported protocols"""
- return Client.gender_choices
+ return tuple([k.name for k in self.query(Protocol).order_by(Protocol.name)])
+ def purposes(self):
+ """Returns a list of all supported purposes"""
- def finger_names(self):
- """Returns a list of all supported finger name values"""
+ return Subset.purpose_choices
- return Finger.name_choices
+ def groups(self):
+ """Returns a list of all supported groups"""
+ return Subset.group_choices
- def sessions(self):
- """Returns a list of all supported session values"""
+ def genders(self):
+ """Returns a list of all supported gender values"""
- return File.session_choices
+ return Client.gender_choices
+ def finger_names(self):
+ """Returns a list of all supported finger name values"""
- def file_from_model_id(self, model_id):
- """Returns the file in the database given a ``model_id``"""
+ return Finger.name_choices
- return self.query(File).filter(File.model_id == model_id).one()
+ def sessions(self):
+ """Returns a list of all supported session values"""
+ return File.session_choices
- def finger_name_from_model_id(self, model_id):
- """Returns the unique finger name in the database given a ``model_id``"""
+ def file_from_model_id(self, model_id):
+ """Returns the file in the database given a ``model_id``"""
- return self.file_from_model_id(model_id).unique_finger_name
+ return self.query(File).filter(File.model_id == model_id).one()
+ def finger_name_from_model_id(self, model_id):
+ """Returns the unique finger name in the database given a ``model_id``"""
- def model_ids(self, protocol=None, groups=None):
- """Returns a set of models for a given protocol/group
+ return self.file_from_model_id(model_id).unique_finger_name
- Parameters:
+ def model_ids(self, protocol=None, groups=None):
+ """Returns a set of models for a given protocol/group
- protocol (:py:class:`str`, :py:class:`list`, optional): One or more of
- the supported protocols. If not set, returns data from all protocols
+ Parameters:
- groups (:py:class:`str`, :py:class:`list`, optional): One or more of the
- supported groups. If not set, returns data from all groups. Notice this
- parameter should either not set or set to ``dev``. Otherwise, this
- method will return an empty list given we don't have a test set, only a
- development set.
+ protocol (:py:class:`str`, :py:class:`list`, optional): One or more of
+ the supported protocols. If not set, returns data from all protocols
+ groups (:py:class:`str`, :py:class:`list`, optional): One or more of the
+ supported groups. If not set, returns data from all groups. Notice this
+ parameter should either not set or set to ``dev``. Otherwise, this
+ method will return an empty list given we don't have a test set, only a
+ development set.
- Returns:
- list: A list of string corresponding model identifiers with the specified
- filtering criteria
+ Returns:
- """
+ list: A list of string corresponding model identifiers with the specified
+ filtering criteria
- protocols = None
- if protocol:
- valid_protocols = self.protocol_names()
- protocols = self.check_parameters_for_validity(protocol, "protocol",
- valid_protocols)
+ """
- if groups:
- valid_groups = self.groups()
- groups = self.check_parameters_for_validity(groups, "group",
- valid_groups)
+ protocols = None
+ if protocol:
+ valid_protocols = self.protocol_names()
+ protocols = self.check_parameters_for_validity(
+ protocol, "protocol", valid_protocols
+ )
- retval = self.query(File)
+ if groups:
+ valid_groups = self.groups()
+ groups = self.check_parameters_for_validity(groups, "group", valid_groups)
- joins = []
- filters = []
+ retval = self.query(File)
- subquery = self.query(Subset)
- subfilters = []
+ joins = []
+ filters = []
- if protocols:
- subquery = subquery.join(Protocol)
- subfilters.append(Protocol.name.in_(protocols))
+ subquery = self.query(Subset)
+ subfilters = []
- if groups:
- subfilters.append(Subset.group.in_(groups))
+ if protocols:
+ subquery = subquery.join(Protocol)
+ subfilters.append(Protocol.name.in_(protocols))
- subfilters.append(Subset.purpose == 'enroll')
+ if groups:
+ subfilters.append(Subset.group.in_(groups))
- subsets = subquery.filter(*subfilters)
- filters.append(File.subsets.any(Subset.id.in_([k.id for k in subsets])))
+ subfilters.append(Subset.purpose == "enroll")
- retval = retval.join(*joins).filter(*filters).distinct().order_by('id')
+ subsets = subquery.filter(*subfilters)
+ filters.append(File.subsets.any(Subset.id.in_([k.id for k in subsets])))
- return sorted(set([k.model_id for k in retval.distinct()]))
+ retval = retval.join(*joins).filter(*filters).distinct().order_by("id")
+ return sorted(set([k.model_id for k in retval.distinct()]))
- def objects(self, protocol=None, groups=None, purposes=None,
- model_ids=None, genders=None, finger_names=None, sessions=None):
- """Returns objects filtered by criteria
+ def objects(
+ self,
+ protocol=None,
+ groups=None,
+ purposes=None,
+ model_ids=None,
+ genders=None,
+ finger_names=None,
+ sessions=None,
+ ):
+ """Returns objects filtered by criteria
- Parameters:
+ Parameters:
- protocol (:py:class:`str`, :py:class:`list`, optional): One or more of
- the supported protocols. If not set, returns data from all protocols
+ protocol (:py:class:`str`, :py:class:`list`, optional): One or more of
+ the supported protocols. If not set, returns data from all protocols
- groups (:py:class:`str`, :py:class:`list`, optional): One or more of the
- supported groups. If not set, returns data from all groups
+ groups (:py:class:`str`, :py:class:`list`, optional): One or more of the
+ supported groups. If not set, returns data from all groups
- purposes (:py:class:`str`, :py:class:`list`, optional): One or more of
- the supported purposes. If not set, returns data for all purposes
+ purposes (:py:class:`str`, :py:class:`list`, optional): One or more of
+ the supported purposes. If not set, returns data for all purposes
- model_ids (:py:class:`str`, :py:class:`list`, optional): If set, limit
- output using the provided model identifiers
+ model_ids (:py:class:`str`, :py:class:`list`, optional): If set, limit
+ output using the provided model identifiers
- genders (:py:class:`str`, :py:class:`list`, optional): If set, limit
- output using the provided gender identifiers
+ genders (:py:class:`str`, :py:class:`list`, optional): If set, limit
+ output using the provided gender identifiers
- finger_names (:py:class:`str`, :py:class:`list`, optional): If set, limit
- output using the provided finger name identifier
+ finger_names (:py:class:`str`, :py:class:`list`, optional): If set, limit
+ output using the provided finger name identifier
- sessions (:py:class:`str`, :py:class:`list`, optional): If set, limit
- output using the provided session identifiers
+ sessions (:py:class:`str`, :py:class:`list`, optional): If set, limit
+ output using the provided session identifiers
- Returns:
+ Returns:
- list: A list of :py:class:`File` objects corresponding to the filtering
- criteria.
+ list: A list of :py:class:`File` objects corresponding to the filtering
+ criteria.
- """
+ """
- protocols = None
- if protocol:
- valid_protocols = self.protocol_names()
- protocols = self.check_parameters_for_validity(protocol, "protocol",
- valid_protocols)
+ protocols = None
- if groups:
- valid_groups = self.groups()
- groups = self.check_parameters_for_validity(
- groups, "group", valid_groups)
+ if protocol:
+ valid_protocols = self.protocol_names()
+ protocols = self.check_parameters_for_validity(
+ protocol, "protocol", valid_protocols
+ )
- if purposes:
- valid_purposes = self.purposes()
- purposes = self.check_parameters_for_validity(purposes, "purpose",
- valid_purposes)
+ if groups:
+ valid_groups = self.groups()
+ groups = self.check_parameters_for_validity(groups, "group", valid_groups)
- # if only asking for 'probes', then ignore model_ids as all of our
- # protocols do a full probe-model scan
- if purposes and len(purposes) == 1 and 'probe' in purposes:
- model_ids = None
+ if purposes:
+ valid_purposes = self.purposes()
+ purposes = self.check_parameters_for_validity(
+ purposes, "purpose", valid_purposes
+ )
- if model_ids:
- valid_model_ids = self.model_ids(protocol, groups)
- model_ids = self.check_parameters_for_validity(model_ids, "model_ids",
- valid_model_ids)
+ # if only asking for 'probes', then ignore model_ids as all of our
+ # protocols do a full probe-model scan
+ if purposes and len(purposes) == 1 and "probe" in purposes:
+ model_ids = None
- if genders:
- valid_genders = self.genders()
- genders = self.check_parameters_for_validity(genders, "genders",
- valid_genders)
+ if model_ids:
+ valid_model_ids = self.model_ids(protocol, groups)
+ model_ids = self.check_parameters_for_validity(
+ model_ids, "model_ids", valid_model_ids
+ )
- if finger_names:
- valid_finger_names = self.finger_names()
- finger_names = self.check_parameters_for_validity(finger_names,
- "finger_names", valid_finger_names)
+ if genders:
+ valid_genders = self.genders()
+ genders = self.check_parameters_for_validity(
+ genders, "genders", valid_genders
+ )
- if sessions:
- valid_sessions = self.sessions()
- sessions = self.check_parameters_for_validity(sessions, "sessions",
- valid_sessions)
+ if finger_names:
+ valid_finger_names = self.finger_names()
+ finger_names = self.check_parameters_for_validity(
+ finger_names, "finger_names", valid_finger_names
+ )
- retval = self.query(File)
+ if sessions:
+ valid_sessions = self.sessions()
+ sessions = self.check_parameters_for_validity(
+ sessions, "sessions", valid_sessions
+ )
- joins = []
- filters = []
+ retval = self.query(File)
- if protocols or groups or purposes:
+ joins = []
+ filters = []
- subquery = self.query(Subset)
- subfilters = []
+ if protocols or groups or purposes:
- if protocols:
- subquery = subquery.join(Protocol)
- subfilters.append(Protocol.name.in_(protocols))
+ subquery = self.query(Subset)
+ subfilters = []
- if groups:
- subfilters.append(Subset.group.in_(groups))
- if purposes:
- subfilters.append(Subset.purpose.in_(purposes))
+ if protocols:
+ subquery = subquery.join(Protocol)
+ subfilters.append(Protocol.name.in_(protocols))
- subsets = subquery.filter(*subfilters)
+ if groups:
+ subfilters.append(Subset.group.in_(groups))
+ if purposes:
+ subfilters.append(Subset.purpose.in_(purposes))
- filters.append(File.subsets.any(Subset.id.in_([k.id for k in subsets])))
+ subsets = subquery.filter(*subfilters)
- if genders or finger_names:
- joins.append(Finger)
+ filters.append(File.subsets.any(Subset.id.in_([k.id for k in subsets])))
- if genders:
- fingers = self.query(Finger).join(
- Client).filter(Client.gender.in_(genders))
- filters.append(Finger.id.in_([k.id for k in fingers]))
+ #import ipdb
- if finger_names:
- filters.append(Finger.name.in_(finger_names))
+ #ipdb.set_trace()
+ joins.append(Finger)
+ if genders or finger_names:
- if sessions:
- filters.append(File.session.in_(sessions))
+ if genders:
+ fingers = (
+ self.query(Finger).join(Client).filter(Client.gender.in_(genders))
+ )
+ filters.append(Finger.id.in_([k.id for k in fingers]))
- if model_ids:
- filters.append(File.model_id.in_(model_ids))
+ if finger_names:
+ filters.append(Finger.name.in_(finger_names))
- # special case for 1vsall protocol: if only one model id given, returns
- # all but the sample for the model id in the list
- if model_ids and len(model_ids) == 1 and \
- protocols and len(protocols) == 1 and \
- protocols[0] == '1vsall':
- filters.append(~self.file_from_model_id(model_ids[0]))
+ if sessions:
+ filters.append(File.session.in_(sessions))
- retval = retval.join(*joins).filter(*filters).distinct().order_by('id')
+ if model_ids:
+ filters.append(File.model_id.in_(model_ids))
- return list(retval)
+ # special case for 1vsall protocol: if only one model id given, returns
+ # all but the sample for the model id in the list
+ if (
+ model_ids
+ and len(model_ids) == 1
+ and protocols
+ and len(protocols) == 1
+ and protocols[0] == "1vsall"
+ ):
+ filters.append(~self.file_from_model_id(model_ids[0]))
+
+ retval = retval.join(*joins).filter(*filters).distinct().order_by("id")
+
+ return list(retval)
--
GitLab