Reorganize imports

chunk_convert.py

@@ -1,4 +1,4 @@
-from marker.scripts import chunk_convert_cli
+from marker.scripts.chunk_convert import chunk_convert_cli
 
 if __name__ == "__main__":
     chunk_convert_cli()

convert.py

@@ -1,4 +1,4 @@
-from marker.scripts import convert_cli
+from marker.scripts.convert import convert_cli
 
 if __name__ == "__main__":
     main()

convert_single.py

@@ -1,4 +1,4 @@
-from marker.scripts import convert_single_cli
+from marker.scripts.convert_single import convert_single_cli
 
 if __name__ == "__main__":
     convert_single_cli()

marker/scripts/__init__.py

@@ -1,5 +0,0 @@
-from marker.scripts.convert_single import convert_single_cli
-from marker.scripts.convert import convert_cli
-from marker.scripts.server import server_cli
-from marker.scripts.run_streamlit_app import streamlit_app_cli
-from marker.scripts.chunk_convert import chunk_convert_cli

marker/scripts/server.py

@@ -3,7 +3,6 @@
 import click
 import os
 
-import uvicorn
 from pydantic import BaseModel, Field
 from starlette.responses import HTMLResponse
 
@@ -162,6 +161,7 @@ async def convert_pdf_upload(
 @click.option("--port", type=int, default=8000, help="Port to run the server on")
 @click.option("--host", type=str, default="127.0.0.1", help="Host to run the server on")
 def server_cli(port: int, host: str):
+    import uvicorn
     # Run the server
     uvicorn.run(
         app,

marker_app.py

@@ -1,4 +1,4 @@
-from marker.scripts import streamlit_app_cli
+from marker.scripts.run_streamlit_app import streamlit_app_cli
 
 if __name__ == "__main__":
     streamlit_app_cli()

marker_server.py

@@ -1,4 +1,4 @@
-from marker.scripts import server_cli
+from marker.scripts.server import server_cli
 
 if __name__ == "__main__":
     server_cli()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "marker-pdf"
-version = "1.2.5"
+version = "1.2.6"
 description = "Convert PDF to markdown with high speed and accuracy."
 authors = ["Vik Paruchuri <github@vikas.sh>"]
 readme = "README.md"