Move bayesdb_metamodel_version to src/metamodel.py.

Author: riastradh-probcomp

src/metamodel.py

@@ -40,6 +40,8 @@
        print x
 """
 
+from bayeslite.util import cursor_value
+
 builtin_metamodels = []
 builtin_metamodel_names = set()
 
@@ -74,6 +76,12 @@ def bayesdb_deregister_metamodel(bdb, metamodel):
     assert bdb.metamodels[name] == metamodel
     del bdb.metamodels[name]
 
+def bayesdb_metamodel_version(bdb, mm_name):
+    cursor = bdb.sql_execute('''
+        SELECT version FROM bayesdb_metamodel WHERE name = ?
+    ''', (mm_name,))
+    return cursor_value(cursor, nullok=True)
+
 class IBayesDBMetamodel(object):
     """BayesDB metamodel interface.
 

src/metamodels/cgpm_metamodel.py

@@ -61,6 +61,7 @@
 
 from bayeslite.exception import BQLError
 from bayeslite.metamodel import IBayesDBMetamodel
+from bayeslite.metamodel import bayesdb_metamodel_version
 from bayeslite.sqlite3_util import sqlite3_quote_name
 from bayeslite.stats import arithmetic_mean
 from bayeslite.util import casefold
@@ -785,11 +786,5 @@ def _default_numerical(bdb, generator_id, var):
 
 # XXX Move these utilities elsewhere.
 
-def bayesdb_metamodel_version(bdb, mm_name):
-    cursor = bdb.sql_execute('''
-        SELECT version FROM bayesdb_metamodel WHERE name = ?
-    ''', (mm_name,))
-    return cursor_value(cursor, nullok=True)
-
 def json_dumps(obj):
     return json.dumps(obj, sort_keys=True)