fixing development

Makefile

@@ -38,7 +38,7 @@ testcov: test
 
 .PHONY: dev
 dev:
-	uvicorn demo.server:app --reload --reload-dir demo
+	uvicorn demo.server:app --reload
 
 .PHONY: all
 all: testcov lint

demo/server.py

@@ -6,7 +6,7 @@
 from pydantic import BaseModel, Field
 
 from fastui import components as c
-from fastui import FastUI
+from fastui import FastUI, PageEvent, GoToEvent, Display, AnyComponent
 
 app = FastAPI()
 
@@ -52,7 +52,7 @@ def read_foo() -> AnyComponent:
                 ],
                 columns=[
                     c.Column(field='name', on_click=GoToEvent(url='/api/more/{id}/')),
-                    c.Column(field='dob', display=c.Display.date),
+                    c.Column(field='dob', display=Display.date),
                     c.Column(field='enabled'),
                 ]
             )

python/fastui/__init__.py

@@ -1,9 +1,9 @@
 __version__ = '0.0.1'
 
-from pydantic import RootModel
+import pydantic
 
 from .components import AnyComponent
 
 
-class FastUI(RootModel):
+class FastUI(pydantic.RootModel):
     root: AnyComponent

python/fastui/components/__init__.py

@@ -11,7 +11,8 @@
 
 import pydantic
 
-from . import events, extra
+from .. import events
+from . import extra
 from .table import Table
 
 if typing.TYPE_CHECKING:

python/fastui/components/table.py

@@ -1,32 +1,17 @@
 from __future__ import annotations as _annotations
 
 import typing
-from enum import StrEnum
 
 import pydantic
 
-from . import events, extra
+from .. import events
+from ..display import Display
+from . import extra
 
 # TODO allow dataclasses and dicts here too
 DataModel = typing.TypeVar('DataModel', bound=pydantic.BaseModel)
 
 
-class Display(StrEnum):
-    """
-    How to a value.
-    """
-
-    auto = 'auto'  # default, same as None below
-    plain = 'plain'
-    datetime = 'datetime'
-    date = 'date'
-    duration = 'duration'
-    as_title = 'as_title'
-    markdown = 'markdown'
-    json = 'json'
-    inline_code = 'inline_code'
-
-
 class Column(pydantic.BaseModel):
     """
     Description of a table column.

python/fastui/display.py

@@ -0,0 +1,17 @@
+from enum import StrEnum
+
+
+class Display(StrEnum):
+    """
+    How to a value.
+    """
+
+    auto = 'auto'  # default, same as None below
+    plain = 'plain'
+    datetime = 'datetime'
+    date = 'date'
+    duration = 'duration'
+    as_title = 'as_title'
+    markdown = 'markdown'
+    json = 'json'
+    inline_code = 'inline_code'