Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pdf-miner
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Qin Kaijie
pdf-miner
Commits
bba53839
Commit
bba53839
authored
Jul 24, 2024
by
myhloli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(magic-pdf): add config file name constant and improve error messages
parent
30ac6f22
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
config_reader.py
magic_pdf/libs/config_reader.py
+9
-6
No files found.
magic_pdf/libs/config_reader.py
View file @
bba53839
...
@@ -10,14 +10,17 @@ from loguru import logger
...
@@ -10,14 +10,17 @@ from loguru import logger
from
magic_pdf.libs.commons
import
parse_bucket_key
from
magic_pdf.libs.commons
import
parse_bucket_key
# 定义配置文件名常量
CONFIG_FILE_NAME
=
"magic-pdf.json"
def
read_config
():
def
read_config
():
home_dir
=
os
.
path
.
expanduser
(
"~"
)
home_dir
=
os
.
path
.
expanduser
(
"~"
)
config_file
=
os
.
path
.
join
(
home_dir
,
"magic-pdf.json"
)
config_file
=
os
.
path
.
join
(
home_dir
,
CONFIG_FILE_NAME
)
if
not
os
.
path
.
exists
(
config_file
):
if
not
os
.
path
.
exists
(
config_file
):
raise
Exception
(
f
"{config_file} not found"
)
raise
FileNotFoundError
(
f
"{config_file} not found"
)
with
open
(
config_file
,
"r"
)
as
f
:
with
open
(
config_file
,
"r"
)
as
f
:
config
=
json
.
load
(
f
)
config
=
json
.
load
(
f
)
...
@@ -37,7 +40,7 @@ def get_s3_config(bucket_name: str):
...
@@ -37,7 +40,7 @@ def get_s3_config(bucket_name: str):
access_key
,
secret_key
,
storage_endpoint
=
bucket_info
[
bucket_name
]
access_key
,
secret_key
,
storage_endpoint
=
bucket_info
[
bucket_name
]
if
access_key
is
None
or
secret_key
is
None
or
storage_endpoint
is
None
:
if
access_key
is
None
or
secret_key
is
None
or
storage_endpoint
is
None
:
raise
Exception
(
"ak, sk or endpoint not found in magic-pdf.json
"
)
raise
Exception
(
f
"ak, sk or endpoint not found in {CONFIG_FILE_NAME}
"
)
# logger.info(f"get_s3_config: ak={access_key}, sk={secret_key}, endpoint={storage_endpoint}")
# logger.info(f"get_s3_config: ak={access_key}, sk={secret_key}, endpoint={storage_endpoint}")
...
@@ -58,7 +61,7 @@ def get_local_dir():
...
@@ -58,7 +61,7 @@ def get_local_dir():
config
=
read_config
()
config
=
read_config
()
local_dir
=
config
.
get
(
"temp-output-dir"
)
local_dir
=
config
.
get
(
"temp-output-dir"
)
if
local_dir
is
None
:
if
local_dir
is
None
:
logger
.
warning
(
"'temp-output-dir' not found in magic-pdf.json
, use '/tmp' as default"
)
logger
.
warning
(
f
"'temp-output-dir' not found in {CONFIG_FILE_NAME}
, use '/tmp' as default"
)
return
"/tmp"
return
"/tmp"
else
:
else
:
return
local_dir
return
local_dir
...
@@ -68,7 +71,7 @@ def get_local_models_dir():
...
@@ -68,7 +71,7 @@ def get_local_models_dir():
config
=
read_config
()
config
=
read_config
()
models_dir
=
config
.
get
(
"models-dir"
)
models_dir
=
config
.
get
(
"models-dir"
)
if
models_dir
is
None
:
if
models_dir
is
None
:
logger
.
warning
(
"'models-dir' not found in magic-pdf.json
, use '/tmp/models' as default"
)
logger
.
warning
(
f
"'models-dir' not found in {CONFIG_FILE_NAME}
, use '/tmp/models' as default"
)
return
"/tmp/models"
return
"/tmp/models"
else
:
else
:
return
models_dir
return
models_dir
...
@@ -78,7 +81,7 @@ def get_device():
...
@@ -78,7 +81,7 @@ def get_device():
config
=
read_config
()
config
=
read_config
()
device
=
config
.
get
(
"device-mode"
)
device
=
config
.
get
(
"device-mode"
)
if
device
is
None
:
if
device
is
None
:
logger
.
warning
(
"'device-mode' not found in magic-pdf.json
, use 'cpu' as default"
)
logger
.
warning
(
f
"'device-mode' not found in {CONFIG_FILE_NAME}
, use 'cpu' as default"
)
return
"cpu"
return
"cpu"
else
:
else
:
return
device
return
device
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment