Refactor to pass tests

Author: Ghislain Fourny

src/jsoniq/session.py

@@ -20,6 +20,7 @@ def __getattr__(cls, item):
 class RumbleSession(object, metaclass=MetaRumbleSession):
     def __init__(self, spark_session: SparkSession):
         self._sparksession = spark_session
+        self._sparksession.addArtifact(jar_path_str)
         self._jrumblesession = spark_session._jvm.org.rumbledb.api.Rumble(spark_session._jsparkSession)
 
     class Builder:
@@ -60,8 +61,18 @@ def __init__(self):
             self._sparkbuilder = SparkSession.builder.config("spark.jars", jar_path_str)
 
         def getOrCreate(self):
-            return RumbleSession(self._sparkbuilder.getOrCreate())
+            if RumbleSession._rumbleSession is None:
+                RumbleSession._rumbleSession = RumbleSession(self._sparkbuilder.getOrCreate())
+            return RumbleSession._rumbleSession
 
+        def create(self):
+            RumbleSession._rumbleSession = RumbleSession(self._sparkbuilder.create())
+            return RumbleSession._rumbleSession
+
+        def remote(self, spark_url):
+            self._sparkbuilder = self._sparkbuilder.remote(spark_url)
+            return self
+
         def appName(self, name):
             self._sparkbuilder = self._sparkbuilder.appName(name);
             return self;
@@ -83,6 +94,7 @@ def __getattr__(self, name):
             return res;
 
     _builder = Builder()
+    _rumbleSession = None
 
     def convert(self, value):
         if isinstance(value, tuple):

src/jsoniqmagic/__init__.py

@@ -0,0 +1,8 @@
+from jsoniq.session import RumbleSession
+from jsoniqmagic.magic import JSONiqMagic
+
+__all__ = ["JSONiqMagic"]
+
+def load_ipython_extension(ipython):
+    rumble = RumbleSession.builder.getOrCreate();
+    ipython.register_magics(JSONiqMagic)

src/jsoniq/magic.py src/jsoniqmagic/magic.pysrc/jsoniq/magic.py renamed to src/jsoniqmagic/magic.py

@@ -1,6 +1,6 @@
 from IPython.core.magic import Magics, cell_magic, magics_class
 import time, json
-from .session import RumbleSession
+from jsoniq.session import RumbleSession
 from py4j.protocol import Py4JJavaError
 
 @magics_class