Make driver & tests usable from python & bazel

Author: krishnangovindraj

sudoku/BUILD

@@ -29,6 +29,10 @@ py_library(
     srcs = ["solver.py"],
     deps = [
         sudoku_requirement("typedb-client")
+    ],
+    data = [
+        ":sudoku6x6_schema.tql",
+        ":sudoku6x6_data.tql",
     ]
 )
 
@@ -40,9 +44,6 @@ py_binary(
         sudoku_requirement("typedb-client")
     ],
     data = [
-        "sudoku6x6_schema.tql",
-        "sudoku6x6_data.tql",
-
         "sample/sudoku1.txt",
         "sample/sudoku2.txt",
         "sample/sudoku3.txt",
@@ -58,9 +59,6 @@ py_test(
         sudoku_requirement("typedb-client")
     ],
     data = [
-            "sudoku6x6_schema.tql",
-            "sudoku6x6_data.tql",
-
             "sample/sudoku1.txt",
             "sample/sudoku2.txt",
             "sample/sudoku3.txt",

sudoku/solver.py

@@ -19,14 +19,14 @@
 # under the License.
 #
 
-
+import os.path
 from typing import List
 
 from typedb.client import TypeDB, TypeDBOptions, SessionType, TransactionType
 
 class Solver:
-    SCHEMA_FILE = "sudoku/sudoku6x6_schema.tql"
-    DATA_FILE = "sudoku/sudoku6x6_data.tql"
+    SCHEMA_FILE = os.path.join(os.path.dirname(__file__), "sudoku6x6_schema.tql")
+    DATA_FILE = os.path.join(os.path.dirname(__file__), "sudoku6x6_data.tql")
     QUERY_TEMPLATE = """
     match
         $connector-hack = -1 isa connector-hack;

sudoku/test.py

@@ -19,7 +19,7 @@
 # under the License.
 #
 import timeit
-from os.path import join as path_join
+import os.path
 import unittest
 
 from typedb.client import TypeDB
@@ -29,7 +29,7 @@
 
 class Test(unittest.TestCase):
     DATABASE_NAME = "test_sudoku6x6"
-    SAMPLE_PATH = "sudoku/sample"
+    SAMPLE_PATH = os.path.join(os.path.dirname(__file__), "sample")
     SAMPLES = [("sudoku1.txt", "solution1.txt"),
                ("sudoku2.txt", "solution2.txt"),
                ("sudoku3.txt", "solution3.txt"),
@@ -43,11 +43,11 @@ def setUp(self):
 
     def test_samples(self):
         for (sample_file, solution_file) in Test.SAMPLES:
-            sudoku = self.solver.read_sudoku(path_join(Test.SAMPLE_PATH, sample_file))
+            sudoku = self.solver.read_sudoku(os.path.join(Test.SAMPLE_PATH, sample_file))
             time_start = timeit.default_timer()
             solver_solution = self.solver.solve(sudoku)
             print("Solved %s in %d ms"% (sample_file, int(1 + 1000 * (timeit.default_timer() - time_start))))
-            expected_solution = self.solver.read_sudoku(path_join(Test.SAMPLE_PATH, solution_file))
+            expected_solution = self.solver.read_sudoku(os.path.join(Test.SAMPLE_PATH, solution_file))
             self.assertEqual(expected_solution, solver_solution)
 
     def tearDown(self):