From 713b7382b67130aa524be371be6ea7118bf5533c Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Sun, 19 Jan 2025 12:42:14 -0500 Subject: [PATCH] Reorganize imports --- chunk_convert.py | 2 +- convert.py | 2 +- convert_single.py | 2 +- marker/scripts/__init__.py | 5 ----- marker/scripts/server.py | 2 +- marker_app.py | 2 +- marker_server.py | 2 +- pyproject.toml | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/chunk_convert.py b/chunk_convert.py index bb976c56..5ed119f7 100755 --- a/chunk_convert.py +++ b/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() \ No newline at end of file diff --git a/convert.py b/convert.py index 0a5a477f..13060151 100755 --- a/convert.py +++ b/convert.py @@ -1,4 +1,4 @@ -from marker.scripts import convert_cli +from marker.scripts.convert import convert_cli if __name__ == "__main__": main() \ No newline at end of file diff --git a/convert_single.py b/convert_single.py index 093fee50..fc1d838b 100755 --- a/convert_single.py +++ b/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() diff --git a/marker/scripts/__init__.py b/marker/scripts/__init__.py index a3f361f5..e69de29b 100644 --- a/marker/scripts/__init__.py +++ b/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 \ No newline at end of file diff --git a/marker/scripts/server.py b/marker/scripts/server.py index 54a44496..e0905b60 100644 --- a/marker/scripts/server.py +++ b/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, diff --git a/marker_app.py b/marker_app.py index f3e6e9dc..59b0371d 100644 --- a/marker_app.py +++ b/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() \ No newline at end of file diff --git a/marker_server.py b/marker_server.py index 434395e5..8d966a0c 100644 --- a/marker_server.py +++ b/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() diff --git a/pyproject.toml b/pyproject.toml index 16643193..3e9d8d34 100644 --- a/pyproject.toml +++ b/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 "] readme = "README.md"