Move metadata routines back into client part of library

Author: gordonwatts

func_adl/__init__.py

@@ -5,6 +5,7 @@
 
 # Extra LINQ-like functions
 from .functions import Range
+from .meta_data import extract_metadata  # NOQA
 
 # Main streaming object
 from .object_stream import ObjectStream

func_adl/ast/__init__.py

@@ -1,6 +1,5 @@
-from .function_simplifier import simplify_chained_calls  # NOQA
 from .aggregate_shortcuts import aggregate_node_transformer  # NOQA
 from .call_stack import argument_stack, stack_frame  # NOQA
 from .func_adl_ast_utils import change_extension_functions_to_calls  # NOQA
 from .func_adl_ast_utils import FuncADLNodeVisitor, function_call  # NOQA
-from .meta_data import extract_metadata  # NOQA
+from .function_simplifier import simplify_chained_calls  # NOQA

func_adl/ast/meta_data.py renamed to func_adl/meta_data.py

@@ -193,7 +193,7 @@ def QMetaData(self, metadata: Dict[str, Any]) -> ObjectStream[T]:
         Returns:
             ObjectStream[T]: The object stream, with metadata attached
         """
-        from .ast.meta_data import lookup_query_metadata
+        from .meta_data import lookup_query_metadata
 
         first = True
         base_ast = self.query_ast
@@ -374,7 +374,7 @@ async def value_async(
         exe = self._get_executor(executor)
 
         # Run it
-        from func_adl.ast.meta_data import remove_empty_metadata
+        from func_adl.meta_data import remove_empty_metadata
 
         return await exe(remove_empty_metadata(self._q_ast), title)
 

func_adl/object_stream.py

@@ -2,7 +2,7 @@
 from typing import Dict, List, Optional
 
 from func_adl import EventDataset
-from func_adl.ast.meta_data import (
+from func_adl.meta_data import (
     extract_metadata,
     lookup_query_metadata,
     remove_empty_metadata,

tests/ast/test_meta_data.py

@@ -195,7 +195,7 @@ def test_query_metadata_composable(caplog):
     r1 = r_base.QMetaData({"two": "2"})
     r2 = r_base.QMetaData({"two": "2+"})
 
-    from func_adl.ast.meta_data import lookup_query_metadata
+    from func_adl.meta_data import lookup_query_metadata
 
     assert lookup_query_metadata(r1, "two") == "2"
     assert lookup_query_metadata(r2, "two") == "2+"