Use SINGLESTOREDB_NOVA_GATEWAY_DEV_BASE_URL

Author: psachdeva-ss

singlestoredb/apps/_config.py

@@ -70,7 +70,6 @@ def token(self) -> Optional[str]:
 class PythonUdfAppConfig:
     listen_port: int
     base_url: str
-    base_path: str
     running_interactively: bool
     is_gateway_enabled: bool
 
@@ -88,7 +87,6 @@ def _read_variable(name: str) -> str:
     def from_env(cls) -> 'AppConfig':
         port = cls._read_variable('SINGLESTOREDB_APP_LISTEN_PORT')
         base_url = cls._read_variable('SINGLESTOREDB_APP_BASE_URL')
-        base_path = cls._read_variable('SINGLESTOREDB_APP_BASE_PATH')
 
         workload_type = os.environ.get('SINGLESTOREDB_WORKLOAD_TYPE')
         running_interactively = workload_type == 'InteractiveNotebook'
@@ -97,8 +95,7 @@ def from_env(cls) -> 'AppConfig':
 
         if running_interactively:
             if is_gateway_enabled:
-                base_url = cls._read_variable('SINGLESTOREDB_PYTHON_UDF_BASE_URL')
-                base_path = cls._read_variable('SINGLESTOREDB_PYTHON_UDF_BASE_PATH')
+                base_url = cls._read_variable('SINGLESTOREDB_NOVA_GATEWAY_DEV_BASE_URL')
             else:
                 raise RuntimeError(
                     'Running Python UDFs in interactive mode without nova-gateway enabled is not supported'
@@ -107,7 +104,6 @@ def from_env(cls) -> 'AppConfig':
         return cls(
             listen_port=int(port),
             base_url=base_url,
-            base_path=base_path,
             running_interactively=running_interactively,
             is_gateway_enabled=is_gateway_enabled,
         )

singlestoredb/apps/_python_udfs.py

@@ -39,8 +39,7 @@ async def run_udf_app(
         # Kill if any other process is occupying the port
         kill_process_by_port(app_config.listen_port)
 
-    app = Application(url=app_config.base_url)
-    app.root_path = app_config.base_path
+    app = Application(url=app_config.base_url) 
 
     config = uvicorn.Config(
         app,
@@ -50,12 +49,12 @@ async def run_udf_app(
     )
     _running_server = AwaitableUvicornServer(config)
 
+    # Register the functions
     app.register_functions(replace=replace_existing)
 
     asyncio.create_task(_running_server.serve())
     await _running_server.wait_for_startup()
 
     connection_info = PythonUdfConnectionInfo(app_config.base_url, app.get_function_info())
 
-
     return connection_info

singlestoredb/config.py

@@ -310,7 +310,7 @@
 register_option(
     'external_function.url', 'string', check_str, 'http://localhost:8000/invoke',
     'Specifies the URL of the external function application.',
-    environ=['SINGLESTOREDB_APP_BASE_URL'],
+    environ=['SINGLESTOREDB_EXT_FUNC_URL' ],
 )
 
 register_option(

singlestoredb/functions/ext/asgi.py

@@ -649,7 +649,6 @@ def __init__(
 
             else:
                 alias = funcs.__name__
-                alias = f'{name_prefix}{alias}{name_suffix}'
                 external_functions[funcs.__name__] = funcs
                 alias = f'{name_prefix}{alias}{name_suffix}'
                 func, info = make_func(alias, funcs)
@@ -702,7 +701,7 @@ async def __call__(
         func_info: Dict[str, Any] = {}
         if func_endpoint is not None:
             func, func_info = func_endpoint
-        
+
         # Call the endpoint
         if method == 'POST' and func is not None and path == self.invoke_path:
             args_data_format = func_info['args_data_format']