refactor(native): Python - remove support for scoped loading

Author: ovr

packages/cubejs-backend-native/src/python/entry.rs

@@ -27,15 +27,7 @@ fn python_load_config(mut cx: FunctionContext) -> JsResult<JsPromise> {
         PyModule::from_code(py, cube_code, "__init__.py", "cube")?;
 
         let config_module = PyModule::from_code(py, &file_content_arg, &options_file_name, "")?;
-        let settings_py = if config_module.hasattr("__execution_context_locals")? {
-            let execution_context_locals = config_module.getattr("__execution_context_locals")?;
-
-            if config_module.hasattr("config")? {
-                execution_context_locals.get_item("config")?
-            } else {
-                config_module.getattr("settings")?
-            }
-        } else if config_module.hasattr("config")? {
+        let settings_py = if config_module.hasattr("config")? {
             config_module.getattr("config")?
         } else {
             // backward compatibility
@@ -109,25 +101,6 @@ fn python_load_model(mut cx: FunctionContext) -> JsResult<JsPromise> {
                     CLRepr::PythonRef(PythonRef::PyExternalFunction(fun)),
                 );
             }
-
-            // TODO remove all other ways of defining functions
-        } else if model_module.hasattr("__execution_context_locals")? {
-            let execution_context_locals = model_module
-                .getattr("__execution_context_locals")?
-                .downcast::<PyDict>()?;
-
-            for (local_key, local_value) in execution_context_locals.iter() {
-                if local_value.is_instance_of::<PyFunction>() {
-                    let has_attr = local_value.hasattr("cube_context_func")?;
-                    if has_attr {
-                        let fun: Py<PyFunction> = local_value.downcast::<PyFunction>()?.into();
-                        collected_functions.insert(
-                            local_key.to_string(),
-                            CLRepr::PythonRef(PythonRef::PyExternalFunction(fun)),
-                        );
-                    }
-                }
-            }
         } else {
             let inspect_module = py.import("inspect")?;
             let args = (model_module, inspect_module.getattr("isfunction")?);

packages/cubejs-backend-native/test/jinja.test.ts

@@ -119,32 +119,6 @@ suite('Python model', () => {
   });
 });
 
-darwinSuite('Scope Python model', () => {
-  it('load scoped-utils.py', async () => {
-    const pythonModule = await loadPythonCtxFromUtils('scoped-utils.py');
-
-    expect(pythonModule.functions).toEqual({
-      load_data: expect.any(Object),
-      load_data_sync: expect.any(Object),
-      arg_bool: expect.any(Object),
-      arg_kwargs: expect.any(Object),
-      arg_named_arguments: expect.any(Object),
-      arg_sum_integers: expect.any(Object),
-      arg_str: expect.any(Object),
-      arg_null: expect.any(Object),
-      arg_sum_tuple: expect.any(Object),
-      arg_sum_map: expect.any(Object),
-      arg_seq: expect.any(Object),
-      new_int_tuple: expect.any(Object),
-      new_str_tuple: expect.any(Object),
-      new_safe_string: expect.any(Object),
-      new_object_from_dict: expect.any(Object),
-      load_class_model: expect.any(Object),
-      throw_exception: expect.any(Object),
-    });
-  });
-});
-
 suite('Jinja (new api)', () => {
   const initJinjaEngine: InitJinjaFn = (() => {
     let pyCtx: native.PythonCtx;

packages/cubejs-backend-native/test/python.test.ts

@@ -236,26 +236,3 @@ darwinSuite('Old Python Config', () => {
     );
   });
 });
-
-darwinSuite('Scoped Python Config', () => {
-  test('test', async () => {
-    const config = await loadConfigurationFile('scoped-config.py');
-    expect(config).toEqual({
-      schemaPath: 'models',
-      pgSqlPort: 5555,
-      telemetry: false,
-      contextToApiScopes: expect.any(Function),
-      checkAuth: expect.any(Function),
-      queryRewrite: expect.any(Function),
-    });
-
-    if (!config.checkAuth) {
-      throw new Error('checkAuth was not defined in config.py');
-    }
-
-    await config.checkAuth(
-      { requestId: 'test' },
-      'MY_SECRET_TOKEN'
-    );
-  });
-});