wip Repackage unit tests

aggregator/src/test/scala/ai/chronon/aggregator/test/ApproxDistinctTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/ApproxDistinctTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.ApproxDistinctCount
 import org.junit.Assert._

aggregator/src/test/scala/ai/chronon/aggregator/test/ApproxPercentilesTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/ApproxPercentilesTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.ApproxPercentiles
 import ai.chronon.aggregator.row.StatsGenerator

aggregator/src/test/scala/ai/chronon/aggregator/test/DataGen.scala → aggregator/src/test/scala/ai/chronon/aggregator/DataGen.scala

@@ -14,9 +14,9 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
-import ai.chronon.aggregator.test.CStream._
+import CStream._
 import ai.chronon.api.Extensions.WindowOps
 import ai.chronon.api._
 

aggregator/src/test/scala/ai/chronon/aggregator/test/EditDistanceTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/EditDistanceTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.stats.EditDistance
 import org.junit.Assert.assertEquals

aggregator/src/test/scala/ai/chronon/aggregator/test/FrequentItemsTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/FrequentItemsTest.scala

@@ -1,4 +1,4 @@
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.FrequentItemType
 import ai.chronon.aggregator.base.FrequentItems

aggregator/src/test/scala/ai/chronon/aggregator/test/MinHeapTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/MinHeapTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.MinHeap
 import org.junit.Assert._

aggregator/src/test/scala/ai/chronon/aggregator/test/MomentTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/MomentTest.scala

@@ -1,4 +1,4 @@
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base._
 import org.apache.commons.math3.stat.descriptive.moment.{Kurtosis => ApacheKurtosis}

aggregator/src/test/scala/ai/chronon/aggregator/test/NaiveAggregator.scala → aggregator/src/test/scala/ai/chronon/aggregator/NaiveAggregator.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.row.RowAggregator
 import ai.chronon.api.Extensions.WindowOps

aggregator/src/test/scala/ai/chronon/aggregator/test/RowAggregatorTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/RowAggregatorTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.row.RowAggregator
 import ai.chronon.api._

aggregator/src/test/scala/ai/chronon/aggregator/test/SawtoothAggregatorTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/SawtoothAggregatorTest.scala

@@ -14,10 +14,10 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.row.RowAggregator
-import ai.chronon.aggregator.test.SawtoothAggregatorTest.sawtoothAggregate
+import SawtoothAggregatorTest.sawtoothAggregate
 import ai.chronon.aggregator.windowing._
 import ai.chronon.api.Extensions.AggregationOps
 import ai.chronon.api._

aggregator/src/test/scala/ai/chronon/aggregator/test/SawtoothOnlineAggregatorTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/SawtoothOnlineAggregatorTest.scala

@@ -14,9 +14,9 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
-import ai.chronon.aggregator.test.SawtoothAggregatorTest.sawtoothAggregate
+import SawtoothAggregatorTest.sawtoothAggregate
 import ai.chronon.aggregator.windowing.FiveMinuteResolution
 import ai.chronon.aggregator.windowing.SawtoothOnlineAggregator
 import ai.chronon.api.Extensions.WindowOps

aggregator/src/test/scala/ai/chronon/aggregator/test/TwoStackLiteAggregatorTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/TwoStackLiteAggregatorTest.scala

@@ -14,10 +14,10 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.TopK
-import ai.chronon.aggregator.test.SawtoothAggregatorTest.sawtoothAggregate
+import SawtoothAggregatorTest.sawtoothAggregate
 import ai.chronon.aggregator.windowing.FiveMinuteResolution
 import ai.chronon.aggregator.windowing.SawtoothAggregator
 import ai.chronon.aggregator.windowing.TwoStackLiteAggregationBuffer

aggregator/src/test/scala/ai/chronon/aggregator/test/UniqueTopKTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/UniqueTopKTest.scala

@@ -1,4 +1,4 @@
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.UniqueTopKAggregator
 import ai.chronon.api._

aggregator/src/test/scala/ai/chronon/aggregator/test/VarianceTest.scala → aggregator/src/test/scala/ai/chronon/aggregator/VarianceTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.aggregator.test
+package ai.chronon.aggregator
 
 import ai.chronon.aggregator.base.Variance
 import org.junit.Assert._

api/python/ai/chronon/staging_query.py

@@ -39,30 +39,6 @@ def to_thrift(self):
             startCutOff=None,
             endCutOff=None
         )
-
-def Import(
-        query: str,
-        version: int,
-        output_namespace: Optional[str] = None,
-        engine_type: Optional[EngineType] = None,
-        dependencies: Optional[List[Union[TableDependency, Dict]]] = None,
-        conf: Optional[common.ConfigProperties] = None,
-        env_vars: Optional[common.EnvironmentVariables] = None,
-        offline_schedule: str = "@daily",
-):
-    assert dependencies is not None and len(dependencies) == 1, f"Import must specify exactly one table dependency. Got: {dependencies}"
-    assert dependencies[0].partition_column is not None, f"Import must specify a partition column for the table dependency. Got: {dependencies[0].partition_column}"
-
-    return StagingQuery(
-        query=query,
-        version=version,
-        output_namespace=output_namespace,
-        dependencies=dependencies,
-        conf=conf,
-        env_vars=env_vars,
-        engine_type=engine_type,
-        offline_schedule=offline_schedule,
-    )
 
 def StagingQuery(
     query: str,

api/python/test/canary/staging_queries/gcp/sample_staging_query.py

@@ -1,6 +1,6 @@
 from joins.gcp import training_set
 
-from ai.chronon.staging_query import EngineType, Import, StagingQuery, TableDependency
+from ai.chronon.staging_query import EngineType, StagingQuery, TableDependency
 from ai.chronon.utils import get_join_output_table_name, get_staging_query_output_table_name
 
 
@@ -93,7 +93,7 @@ def terminal_query(staging_queries):
 WHERE ds BETWEEN {{{{ start_date }}}} AND {{{{ end_date }}}}
 """
 
-v1_bigquery_import = Import(
+v1_bigquery_import = StagingQuery(
     query=bigquery_import_query,
     engine_type=EngineType.BIGQUERY,
     output_namespace="data",

api/src/main/scala/ai/chronon/api/planner/ConfPlanner.scala

@@ -6,8 +6,6 @@ import ai.chronon.planner.{ConfPlan, Node, NodeContent}
 
 import scala.collection.Seq
 
-case class Mode(name: String, nodes: Seq[Node], cron: String)
-
 /** Base class for Chronon orchestration node planning. Corresponds 1:1 with a Chronon
   * conf type (e.g. Join, GroupBy, StagingQuery, ...).
   * The concrete planner implementations are responsible for constructing all the Nodes of the conf (for various

api/src/test/scala/ai/chronon/api/test/CollectionExtensionsTest.scala → api/src/test/scala/ai/chronon/api/CollectionExtensionsTest.scala

@@ -1,6 +1,6 @@
-package ai.chronon.api.test
+package ai.chronon.api
 
-import ai.chronon.api.CollectionExtensions._
+import CollectionExtensions._
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 

api/src/test/scala/ai/chronon/api/test/DataPointerTest.scala → api/src/test/scala/ai/chronon/api/DataPointerTest.scala

@@ -1,7 +1,5 @@
-package ai.chronon.api.test
+package ai.chronon.api
 
-import ai.chronon.api.DataPointer
-import ai.chronon.api.URIDataPointer
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 

api/src/test/scala/ai/chronon/api/test/DataTypeConversionTest.scala → api/src/test/scala/ai/chronon/api/DataTypeConversionTest.scala

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package ai.chronon.api.test
+package ai.chronon.api
 
 import ai.chronon.api._
 import ai.chronon.api.thrift.TSerializer

api/src/test/scala/ai/chronon/api/test/DateMacroSpec.scala → api/src/test/scala/ai/chronon/api/DateMacroSpec.scala

@@ -1,4 +1,4 @@
-package ai.chronon.api.test
+package ai.chronon.api
 
 import ai.chronon.api.ParametricMacro.{adjustDate, applyBasicDateMacros, removeQuotesIfPresent}
 import ai.chronon.api.PartitionSpec

api/src/test/scala/ai/chronon/api/test/ExtensionsTest.scala → api/src/test/scala/ai/chronon/api/ExtensionsTest.scala

@@ -14,12 +14,12 @@
  *    limitations under the License.
  */
 
-package ai.chronon.api.test
+package ai.chronon.api
 
-import ai.chronon.api.Extensions._
-import ai.chronon.api.ScalaJavaConversions._
-import ai.chronon.api.{Accuracy, Builders, ConfigProperties, Constants, ExecutionInfo, GroupBy}
-import org.junit.Assert.{assertEquals, assertFalse, assertTrue}
+import Extensions._
+import ScalaJavaConversions._
+
+import org.junit.Assert.{assertEquals, assertTrue}
 import org.mockito.Mockito.{spy, when}
 import org.scalatest.flatspec.AnyFlatSpec
 

api/src/test/scala/ai/chronon/api/test/RelevantLeftForJoinPartSpec.scala → api/src/test/scala/ai/chronon/api/RelevantLeftForJoinPartSpec.scala

@@ -1,4 +1,4 @@
-package ai.chronon.api.test
+package ai.chronon.api
 
 import ai.chronon.api
 import ai.chronon.api.Builders._

api/src/test/scala/ai/chronon/api/test/TileSeriesSerializationTest.scala → api/src/test/scala/ai/chronon/api/TileSeriesSerializationTest.scala

@@ -1,15 +1,12 @@
-package ai.chronon.api.test
+package ai.chronon.api
 
-import ai.chronon.api.Constants
-import ai.chronon.api.ScalaJavaConversions._
-import ai.chronon.api.ThriftJsonCodec
-import ai.chronon.observability.TileDriftSeries
-import ai.chronon.observability.TileSummarySeries
+import ScalaJavaConversions._
+
+import ai.chronon.observability.{TileDriftSeries, TileSummarySeries}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-import java.lang.{Double => JDouble}
-import java.lang.{Long => JLong}
+import java.lang.{Double => JDouble, Long => JLong}
 
 class TileSeriesSerializationTest extends AnyFlatSpec with Matchers {
 

api/src/test/scala/ai/chronon/api/test/TilingUtilSpec.scala → api/src/test/scala/ai/chronon/api/TilingUtilSpec.scala

@@ -1,6 +1,5 @@
-package ai.chronon.api.test
+package ai.chronon.api
 
-import ai.chronon.api.TilingUtils
 import ai.chronon.fetcher.TileKey
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

api/src/test/scala/ai/chronon/api/test/TimeExpressionSpec.scala → api/src/test/scala/ai/chronon/api/TimeExpressionSpec.scala

@@ -1,7 +1,7 @@
-package ai.chronon.api.test
+package ai.chronon.api
+
+import ColumnExpression.getTimeExpression
 
-import ai.chronon.api.ColumnExpression.getTimeExpression
-import ai.chronon.api.{ColumnExpression, Query}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 

api/src/test/scala/ai/chronon/api/test/planner/ConfPlannerTest.scala → api/src/test/scala/ai/chronon/api/planner/ConfPlannerTest.scala

@@ -1,7 +1,6 @@
-package ai.chronon.api.test.planner
+package ai.chronon.api.planner
 
 import ai.chronon.api.{Builders, PartitionSpec}
-import ai.chronon.api.planner.ConfPlanner
 import ai.chronon.planner.{ConfPlan, GroupByBackfillNode, GroupByStreamingNode}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

api/src/test/scala/ai/chronon/api/test/planner/GroupByPlannerTest.scala → api/src/test/scala/ai/chronon/api/planner/GroupByPlannerTest.scala

@@ -1,9 +1,8 @@
-package ai.chronon.api.test.planner
+package ai.chronon.api.planner
 
-import ai.chronon.api.{Accuracy, Aggregation, Builders, EnvironmentVariables, GroupBy, Operation, PartitionSpec}
 import ai.chronon.api.Extensions.{GroupByOps, MetadataOps, WindowUtils}
-import ai.chronon.api.planner.{GroupByPlanner, LocalRunner}
-import ai.chronon.api.test.planner.GroupByPlannerTest.buildGroupBy
+import ai.chronon.api.planner.GroupByPlannerTest.buildGroupBy
+import ai.chronon.api._
 import ai.chronon.planner.{ConfPlan, Mode}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

api/src/test/scala/ai/chronon/api/test/planner/LocalRunnerTest.scala → api/src/test/scala/ai/chronon/api/planner/LocalRunnerTest.scala

@@ -1,7 +1,6 @@
-package ai.chronon.api.test.planner
+package ai.chronon.api.planner
 
 import ai.chronon.api.{GroupBy, Join, PartitionSpec, StagingQuery}
-import ai.chronon.api.planner.LocalRunner
 import ai.chronon.planner.ConfPlan
 import com.fasterxml.jackson.core.JsonParseException
 import org.scalatest.flatspec.AnyFlatSpec

api/src/test/scala/ai/chronon/api/test/planner/MetaDataUtilsTest.scala → api/src/test/scala/ai/chronon/api/planner/MetaDataUtilsTest.scala

@@ -1,14 +1,6 @@
-package ai.chronon.api.test.planner
-
-import ai.chronon.api.{
-  Builders,
-  ClusterConfigProperties,
-  ConfigProperties,
-  ExecutionInfo,
-  PartitionSpec,
-  TableDependency
-}
-import ai.chronon.api.planner.MetaDataUtils
+package ai.chronon.api.planner
+
+import ai.chronon.api._
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 

api/src/test/scala/ai/chronon/api/test/planner/MonolithJoinPlannerTest.scala → api/src/test/scala/ai/chronon/api/planner/MonolithJoinPlannerTest.scala

@@ -1,13 +1,12 @@
-package ai.chronon.api.test.planner
+package ai.chronon.api.planner
 
 import ai.chronon.api
 import ai.chronon.api.Builders.{Join, MetaData}
-import ai.chronon.api.planner.{LocalRunner, MonolithJoinPlanner}
+import ai.chronon.api.Extensions._
 import ai.chronon.api.{Builders, ExecutionInfo, PartitionSpec}
 import ai.chronon.planner.{ConfPlan, Mode}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
-import ai.chronon.api.Extensions._
 
 import java.nio.file.Paths
 import scala.jdk.CollectionConverters._

api/src/test/scala/ai/chronon/api/test/planner/StagingQueryPlannerTest.scala → api/src/test/scala/ai/chronon/api/planner/StagingQueryPlannerTest.scala

@@ -1,12 +1,9 @@
-package ai.chronon.api.test.planner
+package ai.chronon.api.planner
 
-import ai.chronon.api.{EngineType, ExecutionInfo, PartitionSpec}
-import ai.chronon.api.planner.{LocalRunner, StagingQueryPlanner}
 import ai.chronon.api.Builders.{MetaData, StagingQuery}
+import ai.chronon.api._
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
-import ai.chronon.api.TableDependency
-import ai.chronon.api.TableInfo
 
 import java.nio.file.Paths
 import scala.jdk.CollectionConverters._

api/src/test/scala/ai/chronon/api/test/planner/TableDependenciesTest.scala → api/src/test/scala/ai/chronon/api/planner/TableDependenciesTest.scala

@@ -1,7 +1,6 @@
-package ai.chronon.api.test.planner
+package ai.chronon.api.planner
 
 import ai.chronon.api.Extensions.WindowUtils
-import ai.chronon.api.planner.TableDependencies
 import ai.chronon.api.{Builders, TimeUnit, Window}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers

spark/src/test/scala/ai/chronon/spark/test/DataFrameGen.scala

@@ -16,9 +16,7 @@
 
 package ai.chronon.spark.test
 
-import ai.chronon.aggregator.test.CStream
-import ai.chronon.aggregator.test.Column
-import ai.chronon.aggregator.test.RowsWithSchema
+import ai.chronon.aggregator.{CStream, Column, RowsWithSchema}
 import ai.chronon.api.Constants
 import ai.chronon.api.LongType
 import ai.chronon.api.StringType

spark/src/test/scala/ai/chronon/spark/test/LocalTableExporterTest.scala

@@ -16,7 +16,7 @@
 
 package ai.chronon.spark.test
 
-import ai.chronon.aggregator.test.Column
+import ai.chronon.aggregator.Column
 import ai.chronon.api
 import ai.chronon.api.Constants
 import ai.chronon.api.IntType