geoseeq 0.6.13.dev0__tar.gz → 0.6.13.dev2__tar.gz

{geoseeq-0.6.13.dev0 → geoseeq-0.6.13.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geoseeq
-Version: 0.6.13.dev0
+Version: 0.6.13.dev2
 Summary: GeoSeeq command line tools and python API
 Author: David C. Danko
 Author-email: "David C. Danko" <dcdanko@biotia.io>

{geoseeq-0.6.13.dev0 → geoseeq-0.6.13.dev2}/geoseeq/cli/main.py

@@ -54,7 +54,7 @@ def version():
     Use of this tool implies acceptance of the GeoSeeq End User License Agreement.
     Run `geoseeq eula show` to view the EULA.
     """
-    click.echo('0.6.13dev0')  # remember to update pyproject.toml
+    click.echo('0.6.13dev2')  # remember to update pyproject.toml
 
 
 @main.group('advanced')

{geoseeq-0.6.13.dev0 → geoseeq-0.6.13.dev2}/geoseeq/id_constructors/from_ids.py

@@ -1,4 +1,5 @@
 from geoseeq import GeoseeqNotFoundError
+import logging
 from .from_uuids import (
     org_from_uuid,
     project_from_uuid,
@@ -24,9 +25,12 @@ from .from_names import (
 from .utils import is_grn_or_uuid, is_name
 from geoseeq.knex import with_knex
 
+logger = logging.getLogger("geoseeq_api")  # Same name as calling module
+
 
 def _generic_from_id(knex, id, from_uuid_func, from_name_func):
     """Return the object which the id points to."""
+    logger.info(f'Getting object from id: {id}, knex: {knex}, from_uuid_func: {from_uuid_func}, from_name_func: {from_name_func}')
     if is_grn_or_uuid(id):
         id = id.split(':')[-1]  # if this is a GRN, get the UUID. Won't hurt if it's already a UUID.
         return from_uuid_func(knex, id)

{geoseeq-0.6.13.dev0 → geoseeq-0.6.13.dev2}/geoseeq/knex.py

@@ -222,16 +222,20 @@ class Knex:
 def with_knex(func):
     def wrapper(*args, **kwargs):
         # check if any of the arguments are a knex instance
+        logger.info(f"Checking for knex in args: {args}, kwargs: {kwargs}")
         any_knex = any([isinstance(arg, Knex) for arg in args])
         if any_knex:
+            logger.info("knex found in args args: {args}, kwargs: {kwargs}")
             return func(*args, **kwargs)
         else:
+            logger.info("knex not found in args args: {args}, kwargs: {kwargs}")
             varnames = [
                 varname for varname in func.__code__.co_varnames
                 if varname != "knex"
             ]
             kwargs.update(zip(varnames, args))
             if "knex" not in kwargs:
+                logger.info("knex not found in kwargs args: {args}, kwargs: {kwargs}")
                 profile = kwargs.pop("profile", "")
                 kwargs['knex'] = Knex.load_profile(profile=profile)
             # reorder kwargs to match the function signature

{geoseeq-0.6.13.dev0 → geoseeq-0.6.13.dev2}/geoseeq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geoseeq
-Version: 0.6.13.dev0
+Version: 0.6.13.dev2
 Summary: GeoSeeq command line tools and python API
 Author: David C. Danko
 Author-email: "David C. Danko" <dcdanko@biotia.io>

{geoseeq-0.6.13.dev0 → geoseeq-0.6.13.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geoseeq"
-version = "0.6.13dev0"
+version = "0.6.13dev2"
 authors = [
   { name="David C. Danko", email="dcdanko@biotia.io" },
 ]