fixed problem with GC app type system report not showing properties, and not finding property names

Author: barny

elmclient/_app.py

@@ -155,7 +155,6 @@ def find_project(self, projectname_or_uri, include_archived=False):
         else:
             # must be a name
             projectu = self._projects.get(projectname_or_uri)
-            print( f"{projectu=}" )
             if projectu is None:
                 res = None
             else:
@@ -178,6 +177,7 @@ def report_type_system( self ):
             rows.append( [shortname,k,qcdetails[k]])
         # print in a nice table with equal length columns
         report += utils.print_in_html(rows,['Short Name', 'URI', 'Query Capability URI'])
+        report += self.textreport()
 
         rows = []
         for prefix in sorted(rdfxml.RDF_DEFAULT_PREFIX.keys()):

elmclient/_gcm.py

@@ -131,7 +131,7 @@ def _load_types(self,force=False):
         if sx:
             shapes_to_load = rdfxml.xml_find_elements(sx, './/oslc:resourceShape')
 
-            pbar = tqdm.tqdm(initial=0, total=len(shapes_to_load),smoothing=1,unit=" results",desc="Loading ETM shapes")
+            pbar = tqdm.tqdm(initial=0, total=len(shapes_to_load),smoothing=1,unit=" results",desc="Loading GCM project shapes")
 
             for el in shapes_to_load:
                 self._load_type_from_resource_shape(el)
@@ -142,6 +142,7 @@ def _load_types(self,force=False):
             raise Exception( "services xml not found!" )
 
         self.typesystem_loaded = True
+        burp
         return None
 
 # pick all the attributes from a resource shape definition
@@ -476,11 +477,9 @@ def _load_types(self,force=False):
         if not found:
             raise Exception( "No empty service provider found!" )
         sx = self.execute_get_rdf_xml( spurl, intent="Retrieve project/component service provider XML" )
-
         if sx:
             shapes_to_load = rdfxml.xml_find_elements(sx, './/oslc:resourceShape' )
-
-            pbar = tqdm.tqdm(initial=0, total=len(shapes_to_load),smoothing=1,unit=" results",desc="Loading GCM shapes")
+            pbar = tqdm.tqdm(initial=0, total=len(shapes_to_load),smoothing=1,unit=" results",desc="Loading GCM app shapes")
 
             for el in shapes_to_load:
                 self._load_type_from_resource_shape(el)
@@ -490,7 +489,6 @@ def _load_types(self,force=False):
 
         else:
             raise Exception( "services xml not found!" )
-
         return None
 
     # pick all the attributes from a resource shape definition
@@ -613,7 +611,6 @@ def _generic_load_type_from_resource_shape(self, el, supershape=None):
                 if self.is_known_property_uri( pd_u,shape_uri=uri,raiseifnotfound=False ):
                     logger.debug( f"ALREADY KNOWN2" )
                     continue
-
                 logger.info( f"Defining property {title}.{property_title} {altname=} {pd_u=} +++++++++++++++++++++++++++++++++++++++" )
                 self.register_property(property_title,pd_u, shape_uri=uri, altname=altname)
                 # check for any allowed value
@@ -699,3 +696,11 @@ def resolve_uri_to_name(self, uri, prefer_same_as=True, dontpreferhttprdfrui=Tru
             result = self.get_uri_name(uri)
         logger.info( f"Result {result=}" )
         return result
+        
+    # for OSLC query, given an attribute (property) name return its type URI
+    # the context is the shape definition - can be None, needed to be specified ultimately by the user when property names aren't unique
+    def resolve_property_name_to_uri(self, name, shapeuri=None, exception_if_not_found=True):
+        logger.info( f"resolve_property_name_to_uri {name=} {shapeuri=}" )
+        result = self.get_property_uri(name,shape_uri=shapeuri)
+        logger.info( f"resolve_property_name_to_uri {name=} {shapeuri=} {result=}" )
+        return result

elmclient/examples/oslcquery.py

@@ -410,9 +410,9 @@ def do_oslc_query(inputargs=None):
         # ensure output folder exists
         args.typesystemreport = os.path.abspath(args.typesystemreport)
         outputpath = os.path.split(args.typesystemreport)[0]
-        print( f"{outputpath=}" )
+#        print( f"{outputpath=}" )
         if not os.path.isdir( outputpath ):
-            print( f"creating {outputpath=}" )
+#            print( f"creating {outputpath=}" )
             os.makedirs( outputpath, exist_ok=True)
 
         open( args.typesystemreport, "wt").write( queryon.report_type_system() )
@@ -425,9 +425,9 @@ def do_oslc_query(inputargs=None):
         # ensure the output folder exists
         args.outputfile = os.path.abspath(args.outputfile)
         outputpath = os.path.split(args.outputfile)[0]
-        print( f"{outputpath=}" )
+#        print( f"{outputpath=}" )
         if not os.path.isdir( outputpath ):
-            print( f"creating {outputpath=}" )
+#            print( f"creating {outputpath=}" )
             os.makedirs( outputpath, exist_ok=True)
 
     # erase the output file (also checks that it isn't open in Excel) before doing a possibly lengthy query :-)
@@ -590,9 +590,9 @@ def safeint(s,nonereturns=0):
         # ensure output folder exists
         args.xmloutputfile = os.path.abspath(args.xmloutputfile)
         outputpath = os.path.split(args.xmloutputfile)[0]
-        print( f"{outputpath=}" )
+#        print( f"{outputpath=}" )
         if not os.path.isdir( outputpath ):
-            print( f"creating {outputpath=}" )
+#            print( f"creating {outputpath=}" )
             os.makedirs( outputpath, exist_ok=True)
 
         # basically for RM: retrieve all the result resources (as RDF-XML) and store to one file per resource