X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/85e220b097f5bdc47cd4fa702ddf9924aba3022d..4a32d3d0331bfb9cfb3be8d7016859e860bf453e:/pokedex/lookup.py?ds=inline diff --git a/pokedex/lookup.py b/pokedex/lookup.py index f419c1f..cb6d5f6 100644 --- a/pokedex/lookup.py +++ b/pokedex/lookup.py @@ -3,6 +3,7 @@ from collections import namedtuple import os, os.path import pkg_resources import re +import shutil from sqlalchemy.sql import func import whoosh @@ -10,12 +11,15 @@ import whoosh.filedb.filestore import whoosh.filedb.fileindex import whoosh.index from whoosh.qparser import QueryParser +import whoosh.scoring import whoosh.spelling from pokedex.db import connect import pokedex.db.tables as tables from pokedex.roomaji import romanize +__all__ = ['open_index', 'lookup'] + # Dictionary of table name => table class. # Need the table name so we can get the class from the table name after we # retrieve something from the index @@ -50,7 +54,7 @@ def open_index(directory=None, session=None, recreate=False): # Defaults if not directory: directory = pkg_resources.resource_filename('pokedex', - 'data/whoosh_index') + 'data/whoosh-index') if not session: session = connect() @@ -68,16 +72,26 @@ def open_index(directory=None, session=None, recreate=False): # Apparently not a real index. Fall out of the if and create it pass + # Delete and start over if we're going to bail anyway. + if directory_exists and recreate: + # Be safe and only delete if it looks like a whoosh index, i.e., + # everything starts with _ + if all(f[0] == '_' for f in os.listdir(directory)): + shutil.rmtree(directory) + directory_exists = False + if not directory_exists: os.mkdir(directory) - # Create index + ### Create index schema = whoosh.fields.Schema( name=whoosh.fields.ID(stored=True), - table=whoosh.fields.STORED, + table=whoosh.fields.ID(stored=True), row_id=whoosh.fields.ID(stored=True), language=whoosh.fields.STORED, + display_name=whoosh.fields.STORED, # non-lowercased name + forme_name=whoosh.fields.ID, ) index = whoosh.index.create_in(directory, schema=schema, indexname='MAIN') @@ -92,37 +106,40 @@ def open_index(directory=None, session=None, recreate=False): for cls in indexed_tables.values(): q = session.query(cls) - # Only index base Pokémon formes - if hasattr(cls, 'forme_base_pokemon_id'): - q = q.filter_by(forme_base_pokemon_id=None) - for row in q.yield_per(5): - row_key = dict(table=cls.__tablename__, row_id=unicode(row.id)) + # XXX need to give forme_name a dummy value because I can't search + # for explicitly empty fields. boo. + row_key = dict(table=unicode(cls.__tablename__), + row_id=unicode(row.id), + forme_name=u'XXX') + + def add(name, language, score): + writer.add_document(name=name.lower(), display_name=name, + language=language, + **row_key) + speller_entries.append((name.lower(), score)) + + # If this is a form, mark it as such + if getattr(row, 'forme_base_pokemon_id', None): + row_key['forme_name'] = row.forme_name - name = row.name.lower() - writer.add_document(name=name, **row_key) - speller_entries.append((name, 1)) + name = row.name + add(name, None, 1) # Pokemon also get other languages for foreign_name in getattr(row, 'foreign_names', []): - moonspeak = foreign_name.name.lower() + moonspeak = foreign_name.name if name == moonspeak: # Don't add the English name again as a different language; # no point and it makes spell results confusing continue - writer.add_document(name=moonspeak, - language=foreign_name.language.name, - **row_key) - speller_entries.append((moonspeak, 3)) + add(moonspeak, foreign_name.language.name, 3) # Add Roomaji too if foreign_name.language.name == 'Japanese': - roomaji = romanize(foreign_name.name).lower() - writer.add_document(name=roomaji, language='Roomaji', - **row_key) - speller_entries.append((roomaji, 8)) - + roomaji = romanize(foreign_name.name) + add(roomaji, u'Roomaji', 8) writer.commit() @@ -135,11 +152,28 @@ def open_index(directory=None, session=None, recreate=False): return index, speller +class LanguageWeighting(whoosh.scoring.Weighting): + """A scoring class that forces otherwise-equal English results to come + before foreign results. + """ + + def score(self, searcher, fieldnum, text, docnum, weight, QTF=1): + doc = searcher.stored_fields(docnum) + if doc['language'] == None: + # English (well, "default"); leave it at 1 + return weight + elif doc['language'] == u'Roomaji': + # Give Roomaji a bit of a boost, as it's most likely to be searched + return weight * 0.95 + else: + # Everything else can drop down the totem pole + return weight * 0.9 + rx_is_number = re.compile('^\d+$') LookupResult = namedtuple('LookupResult', ['object', 'name', 'language', 'exact']) -def lookup(input, session=None, indices=None, exact_only=False): +def lookup(input, valid_types=[], session=None, indices=None, exact_only=False): """Attempts to find some sort of object, given a database session and name. Returns a list of named (object, name, language, exact) tuples. `object` @@ -156,12 +190,22 @@ def lookup(input, session=None, indices=None, exact_only=False): - Names: "Eevee", "Surf", "Run Away", "Payapa Berry", etc. - Foreign names: "Iibui", "Eivui" - Fuzzy names in whatever language: "Evee", "Ibui" - - IDs: "pokemon 133", "move 192", "item 250" - - Dex numbers: "sinnoh 55", "133", "johto 180" + - IDs: "133", "192", "250" + Also: + - Type restrictions. "type:psychic" will only return the type. This is + how to make ID lookup useful. Multiple type specs can be entered with + commas, as "move,item:1". If `valid_types` are provided, any type prefix + will be ignored. + - Alternate formes can be specified merely like "wash rotom". `input` Name of the thing to look for. + `valid_types` + A list of table objects or names, e.g., `['pokemon', 'moves']`. If + this is provided, only results in one of the given tables will be + returned. + `session` A database session to use for retrieving objects. As with get_index, if this is not provided, a connection to the default database will be @@ -187,20 +231,60 @@ def lookup(input, session=None, indices=None, exact_only=False): name = unicode(input).lower() exact = True - - # If the input provided is a number, match it as an id. Otherwise, name - if rx_is_number.match(input): - query_column = 'row_id' - exact_only = True # don't spell-check numbers! + form = None + + # Remove any type prefix (pokemon:133) before constructing a query + if ':' in name: + prefix_chunk, name = name.split(':', 2) + prefixes = prefix_chunk.split(',') + if not valid_types: + # Only use types from the query string if none were explicitly + # provided + valid_types = prefixes + + # If the input provided is a number, match it as an id. Otherwise, name. + # Term objects do an exact match, so we don't have to worry about a query + # parser tripping on weird characters in the input + if rx_is_number.match(name): + # Don't spell-check numbers! + exact_only = True + query = whoosh.query.Term(u'row_id', name) else: # Not an integer - query_column = 'name' + query = whoosh.query.Term(u'name', name) \ + & whoosh.query.Term(u'forme_name', u'XXX') + + # If there's a space in the input, this might be a form + if ' ' in name: + form, formless_name = name.split(' ', 2) + form_query = whoosh.query.Term(u'name', formless_name) \ + & whoosh.query.Term(u'forme_name', form) + query = query | form_query + + ### Filter by type of object + type_terms = [] + for valid_type in valid_types: + if hasattr(valid_type, '__tablename__'): + table_name = getattr(valid_type, '__tablename__') + elif valid_type in indexed_tables: + table_name = valid_type + elif valid_type + 's' in indexed_tables: + table_name = valid_type + 's' + else: + # Bogus. Be nice and ignore it + continue - # Look for exact name. A Term object does an exact match, so we don't have - # to worry about a query parser tripping on weird characters in the input + type_terms.append(whoosh.query.Term(u'table', table_name)) + + if type_terms: + query = query & whoosh.query.Or(type_terms) + + + ### Actual searching searcher = index.searcher() - query = whoosh.query.Term(query_column, name) - print query + searcher.weighting = LanguageWeighting() # XXX kosher? docs say search() + # takes a weighting kw but it + # certainly does not results = searcher.search(query) # Look for some fuzzy matches if necessary @@ -217,12 +301,6 @@ def lookup(input, session=None, indices=None, exact_only=False): seen = {} for result in results: # Skip dupe results - # Note! The speller prefers English names, but the query does not. So - # "latias" comes over "ratiasu". "latias" matches only the English - # row, comes out first, and all is well. - # However! The speller could then return "foo" which happens to be the - # name for two different things in different languages, and the - # non-English one could appear preferred. This is not very likely. seen_key = result['table'], result['row_id'] if seen_key in seen: continue @@ -230,8 +308,9 @@ def lookup(input, session=None, indices=None, exact_only=False): cls = indexed_tables[result['table']] obj = session.query(cls).get(result['row_id']) + objects.append(LookupResult(object=obj, - name=result['name'], + name=result['display_name'], language=result['language'], exact=exact))