Enhance error handling in Owlery queries and update count logic in caching system

Author: Robbie1977

src/vfbquery/solr_result_cache.py

@@ -617,16 +617,17 @@ def wrapper(*args, **kwargs):
                         if is_valid and preview and 'Queries' in cached_result:
                             logger.debug(f"Validating {len(cached_result['Queries'])} queries for {term_id}")
                             for i, query in enumerate(cached_result['Queries']):
-                                count = query.get('count', 0)
+                                count = query.get('count', -1)  # Default to -1 if missing
                                 preview_results = query.get('preview_results')
                                 headers = preview_results.get('headers', []) if isinstance(preview_results, dict) else []
 
                                 logger.debug(f"Query {i}: count={count}, preview_results_type={type(preview_results)}, headers={headers}")
 
-                                # Check if query has unrealistic count (0 or -1) which indicates failed execution
-                                if count <= 0:
+                                # Check if query has error count (-1) which indicates failed execution
+                                # Note: count of 0 is valid - it means "no matches found"
+                                if count < 0:
                                     is_valid = False
-                                    logger.debug(f"Cached result has invalid query count {count} for {term_id}")
+                                    logger.debug(f"Cached result has error query count {count} for {term_id}")
                                     break
                                 # Check if preview_results is missing or has empty headers when it should have data
                                 if not isinstance(preview_results, dict) or not headers:
@@ -672,13 +673,14 @@ def wrapper(*args, **kwargs):
                         if preview and 'Queries' in result and result['Queries']:
                             # Check that all queries have valid counts and preview_results
                             for query in result['Queries']:
-                                count = query.get('count', -1)
+                                count = query.get('count', -1)  # Default to -1 if missing
                                 preview_results = query.get('preview_results')
 
-                                # Don't cache if query has invalid count (0 or -1)
-                                if count <= 0:
+                                # Don't cache if query has error count (-1 indicates failure)
+                                # Note: count of 0 is valid - it means "no matches found"
+                                if count < 0:
                                     is_complete = False
-                                    logger.warning(f"Not caching result for {term_id}: query has invalid count {count}")
+                                    logger.warning(f"Not caching result for {term_id}: query has error count {count}")
                                     break
 
                                 # Don't cache if preview_results is missing or malformed

src/vfbquery/vfb_queries.py

@@ -1961,15 +1961,20 @@ def _owlery_query_to_results(owl_query_string: str, short_form: str, return_data
     """
     try:
         # Step 1: Query Owlery for classes matching the OWL pattern
-        print(f"DEBUG: Executing Owlery query: {owl_query_string}")
-        print(f"DEBUG: Query parameters - short_form: {short_form}, query_by_label: {query_by_label}")
-        
+        # Construct the full Owlery URL for debugging
+        owlery_base = "https://owl.virtualflybrain.org/kbs/vfb"  # Default
         try:
-            # Try to get the Owlery endpoint for debugging
-            owlery_endpoint = getattr(vc.vfb.oc, 'owlery', 'unknown')
-            print(f"DEBUG: Owlery endpoint: {owlery_endpoint}")
+            if hasattr(vc.vfb, 'oc') and hasattr(vc.vfb.oc, 'owlery_endpoint'):
+                owlery_base = vc.vfb.oc.owlery_endpoint.rstrip('/')
         except Exception:
-            pass  # Ignore if we can't get the endpoint
+            pass
+        
+        # Construct the actual API call URL (what vfb_connect calls)
+        from urllib.parse import quote
+        query_encoded = quote(owl_query_string, safe='')
+        owlery_url = f"{owlery_base}/subclasses?object={query_encoded}"
+        
+        print(f"DEBUG Owlery: {owlery_url}")
 
         class_ids = vc.vfb.oc.get_subclasses(
             query=owl_query_string,
@@ -2105,18 +2110,16 @@ def _owlery_query_to_results(owl_query_string: str, short_form: str, return_data
         }
 
     except Exception as e:
-        print(f"Error in Owlery query: {e}")
-        print(f"Failed query string: {owl_query_string}")
-        print(f"Failed query parameters - short_form: {short_form}, query_by_label: {query_by_label}, solr_field: {solr_field}")
+        print(f"ERROR Owlery query failed: {e}")
         import traceback
         traceback.print_exc()
-        # Return empty results
+        # Return error indication with count=-1
         if return_dataframe:
             return pd.DataFrame()
         return {
             "headers": _get_standard_query_headers() if not include_source else _get_neurons_part_here_headers(),
             "rows": [],
-            "count": 0
+            "count": -1  # -1 indicates query error/failure
         }