Merge pull request #97 from hbh112233abc/main

config传参默认可以不传,解决默认onnx,报须torch库的问题

Author: SWHL

rapid_table/main.py

@@ -16,7 +16,7 @@
 from rapid_table.utils import DownloadModel, LoadImage, Logger, VisTable
 
 from .table_matcher import TableMatch
-from .table_structure import TableStructurer, TableStructureUnitable
+
 
 logger = Logger(logger_name=__name__).get_log()
 root_dir = Path(__file__).resolve().parent
@@ -59,7 +59,12 @@ class RapidTableOutput:
 
 
 class RapidTable:
-    def __init__(self, config: RapidTableInput):
+    def __init__(self, config: Optional[RapidTableInput] = None):
+        if config is None:
+            config = RapidTableInput()
+        if not isinstance(config, RapidTableInput):
+            raise TypeError(f"config must be an instance of RapidTableInput, but got {type(config)}")
+            
         self.model_type = config.model_type
         if self.model_type not in KEY_TO_MODEL_URL:
             model_list = ",".join(KEY_TO_MODEL_URL)
@@ -69,8 +74,10 @@ def __init__(self, config: RapidTableInput):
 
         config.model_path = self.get_model_path(config.model_type, config.model_path)
         if self.model_type == ModelType.UNITABLE.value:
+            from .table_structure.table_structure_unitable import TableStructureUnitable
             self.table_structure = TableStructureUnitable(asdict(config))
         else:
+            from .table_structure.table_structure import TableStructurer
             self.table_structure = TableStructurer(asdict(config))
 
         self.table_matcher = TableMatch()

rapid_table/table_structure/__init__.py

@@ -11,5 +11,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from .table_structure import TableStructurer
-from .table_structure_unitable import TableStructureUnitable
+