Also run string ops code examples (fixes regression). Makes sure example classes that don't directly inherit from Example base class are run. Addressed a few of those examples failing.

Author: juliannguyen4

examples/__init__.py

@@ -24,7 +24,8 @@ def __init__(
         self.client = client
         self.namespace = namespace
         self.set_name = set_name
-        self.key = (self.namespace, self.set_name, "docreadkey")
+        self.user_key = "docreadkey"
+        self.key = (self.namespace, self.set_name, self.user_key)
         self.non_existent_key = (self.namespace, self.set_name, "nonexistent")
         self.BIN_NAME = "a"
 
@@ -39,7 +40,7 @@ def __init__(self):
                 'user_path': os.path.dirname(__file__) + "/client/"
             }
         }
-        super().__init__(extra_config)
+        super().__init__(extra_config=extra_config)
 
 class ExampleWithIndex(Example):
     INDEX_NAME = "index_name"

examples/client/aggregate.py

@@ -25,15 +25,15 @@
 class Aggregate(ExampleWithIndex, UDFExample):
     def run(self):
         predicates = [
-            p.equals(self.BIN, 1),
-            p.between(self.BIN, 1, 3)
+            p.equals(self.BIN_NAME, 1),
+            p.between(self.BIN_NAME, 1, 3)
         ]
 
         for predicate in predicates:
             # If predicate is provided, then perform a query
             query = self.client.query(self.namespace, self.set_name)
             query.where(predicate)
-            BINS = [self.BIN]
+            BINS = [self.BIN_NAME]
             query.select(*BINS)
 
             MODULE = "stream_example"

examples/client/apply.py

@@ -16,14 +16,16 @@
 ##########################################################################
 
 
-from .. import ExampleWithRecord
+from .. import ExampleWithRecord, UDFExample
 
 
-class Apply(ExampleWithRecord):
+class Apply(ExampleWithRecord, UDFExample):
     def run(self):
-        module = "module"
-        function = "a"
-        args = []
+        self.client.udf_put("./examples/client/simple.lua")
+
+        module = "simple"
+        function = "add"
+        args = [1, 2]
         res = self.client.apply(self.key, module, function, args)
 
         print(res)

examples/client/batch_read.py

@@ -20,16 +20,13 @@
 
 
 class BatchRead(ExampleWithRecord):
-    def __init__(self):
-        pass
-
     def run(self):
         # Get records
         keys = [self.key, self.non_existent_key]
         records = self.client.batch_read(keys)
 
         if records != None:
-            print(f"{len(records)} records were found")
+            print(f"{len(records.batch_records)} records were found")
             print(records)
         else:
             print('error: Not Found.')
@@ -38,7 +35,7 @@ def run(self):
         records = self.client.batch_read(keys, bins=["a"])
 
         if records != None:
-            print(f"{len(records)} records were found")
+            print(f"{len(records.batch_records)} records were found")
             print(records)
         else:
             print('error: Not Found.')
@@ -47,7 +44,7 @@ def run(self):
         records = self.client.batch_read(keys, bins=[])
 
         if records != None:
-            print(f"{len(records)} records were found")
+            print(f"{len(records.batch_records)} records were found")
             print(records)
         else:
             print('error: Not Found.')

examples/client/get_key_digest.py

@@ -22,5 +22,5 @@
 
 class CalcDigest(ExampleWithRecord):
     def run(self):
-        digest = aerospike.calc_digest(self.namespace, self.set_name, self.key)
+        digest = aerospike.calc_digest(self.namespace, self.set_name, self.user_key)
         print(digest)

examples/client/query.py

@@ -24,6 +24,8 @@
 
 class Query(UDFExample):
     def run(self):
+        self.client.udf_put("./examples/client/stream_example.lua")
+
         query = self.client.query(self.namespace, self.set_name)
 
         query.select(self.BIN_NAME)
@@ -36,9 +38,11 @@ def run(self):
 
         # callback to be called for each record read
         def callback(input_tuple):
-            (key, meta, rec) = input_tuple
-            results.append((key, meta, rec))
-            print(key, meta, rec)
+            print(input_tuple)
+            # (key, meta, rec) = input_tuple
+            # nonlocal results
+            # results.append((key, meta, rec))
+            # print(key, meta, rec)
 
         # invoke the operations, and for each record invoke the callback
         query.foreach(callback)

examples/run_all_examples.py

@@ -3,26 +3,33 @@
 import inspect
 import os
 import sys
-# from . import Example
 
 
 example_classes: list[type] = []
 
 dir_containing_this_module = os.path.dirname(os.path.abspath(__file__))
-all_packages = pkgutil.walk_packages([dir_containing_this_module + "/client"])
-for package in all_packages:
-    print(package)
-    module = importlib.import_module("." + package.name, ".examples.client")
-    for name, obj in inspect.getmembers(module, inspect.isclass):
-        if obj.__module__ != module.__name__:
-            continue
-        print("Class found:", obj)
-        # print(Example is obj.__bases__[0])
-        # TODO - comparing the same class imported two different ways fails
-        # There might a better way to do this
-        if obj.__bases__[0].__name__ != "Example":
-            continue
-        example_classes.append(obj)
+
+for folder in ["client", "string_ops"]:
+    all_packages = pkgutil.walk_packages([
+        dir_containing_this_module + "/" + folder,
+    ])
+    for package in all_packages:
+        print(package)
+        module = importlib.import_module("." + package.name, ".examples." + folder)
+        for name, obj in inspect.getmembers(module, inspect.isclass):
+            if obj.__module__ != module.__name__:
+                continue
+            # print(Example is obj.__bases__[0])
+            # TODO - comparing the same class imported two different ways fails
+            # There might a better way to do this
+            print("Found class has these base classes:", obj.__mro__)
+            if "Example" not in [obj.__name__ for obj in obj.__mro__]:
+                continue
+            if not hasattr(obj, "run") or not callable(getattr(obj, "run")):
+                continue
+
+            print("Class found:", obj)
+            example_classes.append(obj)
 
 if len(sys.argv) == 2:
     example_classes = [cls for cls in example_classes if cls.__name__ == sys.argv[1]]