cleanup imports under objectbox.model #52

This improves significantly the API docs; it basically gives access to Propertys and its super classes to browse available conditionals.

Author: dan-obx

objectbox/__init__.py

@@ -15,7 +15,9 @@
 
 from objectbox.store import Store
 from objectbox.box import Box
-from objectbox.model import Model, Entity, Id, String, Index, Bool, Int8, Int16, Int32, Int64, Float32, Float64, Bytes, BoolVector, Int8Vector, Int16Vector, Int32Vector, Int64Vector, Float32Vector, Float64Vector, CharVector, BoolList, Int8List, Int16List, Int32List, Int64List, Float32List, Float64List, CharList, Date, DateNano, Flex, HnswIndex, VectorDistanceType
+from objectbox.model.entity import Entity
+from objectbox.model.properties import Id, String, Index, Bool, Int8, Int16, Int32, Int64, Float32, Float64, Bytes, BoolVector, Int8Vector, Int16Vector, Int32Vector, Int64Vector, Float32Vector, Float64Vector, CharVector, BoolList, Int8List, Int16List, Int32List, Int64List, Float32List, Float64List, CharList, Date, DateNano, Flex, HnswIndex, VectorDistanceType
+from objectbox.model.model import Model
 from objectbox.c import NotFoundException, version_core, DebugFlags
 from objectbox.version import Version
 from objectbox.builder import Builder
@@ -68,7 +70,7 @@
 
 # Python binding version
 version = Version(4, 0, 0)
-"""ObjectBox Python version"""
+"""ObjectBox Python package version"""
 
 def version_info():
     """Returns a string with Python and core version information."""

objectbox/builder.py

@@ -14,7 +14,7 @@
 
 
 from objectbox.c import *
-from objectbox.model import Model
+from objectbox.model.model import Model
 from objectbox.store import Store
 from objectbox.store_options import StoreOptions
 from warnings import warn

objectbox/model/idsync.py

@@ -1,7 +1,7 @@
 import random
 from typing import *
 from objectbox.logger import logger
-from objectbox.model import Model
+from objectbox.model.model import Model
 from objectbox.model.entity import _Entity
 from objectbox.model.properties import Property, Index, HnswIndex
 from objectbox.model.iduid import IdUid

objectbox/store_options.py

@@ -1,5 +1,5 @@
 from objectbox.c import *
-from objectbox.model import Model
+from objectbox.model.model import Model
 
 
 class StoreOptions:

tests/common.py

@@ -36,7 +36,7 @@ def create_test_store(db_path: str = "testdata", clear_db: bool = True) -> objec
 
 
 def assert_equal_prop(actual, expected, default):
-    if isinstance(expected, objectbox.model.Property):
+    if isinstance(expected, objectbox.model.properties.Property):
         assert (actual == default)
     else:
         assert (actual == expected)
@@ -49,7 +49,7 @@ def assert_equal_prop_vector(actual, expected, default):
 
 # compare approx values
 def assert_equal_prop_approx(actual, expected, default):
-    if isinstance(expected, objectbox.model.Property):
+    if isinstance(expected, objectbox.model.properties.Property):
         assert (actual == default)
     else:
         assert (pytest.approx(actual) == expected)

tests/test_idsync.py

@@ -4,8 +4,10 @@
 from numpy.testing import assert_approx_equal
 from objectbox import *
 from objectbox.model import *
+from objectbox.model.properties import Property, PropertyType
 from objectbox.model.entity import _Entity
 from objectbox.model.idsync import sync_model
+from objectbox.model.iduid import IdUid
 from objectbox.c import CoreException
 from os import path