Skip to content

Commit afcce60

Browse files
authored
Merge pull request #326 from superannotateai/sdk_logging
Added time in the logs.
2 parents 53d9d7d + acc5831 commit afcce60

File tree

4 files changed

+33
-21
lines changed

4 files changed

+33
-21
lines changed

src/superannotate/__init__.py

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
"fileHandler": {
221221
"class": "logging.handlers.RotatingFileHandler",
222222
"level": "DEBUG",
223-
"formatter": "consoleFormatter",
223+
"formatter": "fileFormatter",
224224
"filename": expanduser(constances.LOG_FILE_LOCATION),
225225
"mode": "a",
226226
"maxBytes": 5 * 1024 * 1024,
@@ -230,6 +230,9 @@
230230
"formatters": {
231231
"consoleFormatter": {
232232
"format": "SA-PYTHON-SDK - %(levelname)s - %(message)s",
233+
},
234+
"fileFormatter": {
235+
"format": "SA-PYTHON-SDK - %(levelname)s - %(asctime)s - %(message)s"
233236
}
234237
},
235238
"root": { # root logger
@@ -239,22 +242,28 @@
239242
}
240243
)
241244

242-
local_version = parse(__version__)
243-
if local_version.is_prerelease:
244-
logging.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
245-
req = requests.get("https://pypi.python.org/pypi/superannotate/json")
246-
if req.ok:
247-
releases = req.json().get("releases", [])
248-
pip_version = parse("0")
249-
for release in releases:
250-
ver = parse(release)
251-
if not ver.is_prerelease or local_version.is_prerelease:
252-
pip_version = max(pip_version, ver)
253-
if pip_version.major > local_version.major:
254-
logging.warning(
255-
constances.PACKAGE_VERSION_MAJOR_UPGRADE.format(local_version, pip_version)
256-
)
257-
elif pip_version > local_version:
258-
logging.warning(
259-
constances.PACKAGE_VERSION_UPGRADE.format(local_version, pip_version)
260-
)
245+
246+
def log_version_info():
247+
local_version = parse(__version__)
248+
if local_version.is_prerelease:
249+
logging.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
250+
req = requests.get("https://pypi.python.org/pypi/superannotate/json")
251+
if req.ok:
252+
releases = req.json().get("releases", [])
253+
pip_version = parse("0")
254+
for release in releases:
255+
ver = parse(release)
256+
if not ver.is_prerelease or local_version.is_prerelease:
257+
pip_version = max(pip_version, ver)
258+
if pip_version.major > local_version.major:
259+
logging.warning(
260+
constances.PACKAGE_VERSION_MAJOR_UPGRADE.format(local_version, pip_version)
261+
)
262+
elif pip_version > local_version:
263+
logging.warning(
264+
constances.PACKAGE_VERSION_UPGRADE.format(local_version, pip_version)
265+
)
266+
267+
268+
log_version_info()
269+

src/superannotate/lib/app/input_converters/export_from_sa_conversions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ def export_from_sa(args):
7575
args.output_dir, args.input_dir / "classes" / "classes.json"
7676
)
7777
except Exception as e:
78+
logger.debug(str(e), exc_info=True)
7879
_create_classes_mapper(args.input_dir, args.output_dir)
7980

8081
data_set = _load_files(args.input_dir, args.task, args.project_type)

src/superannotate/lib/app/input_converters/sa_conversion.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def upgrade_json(input_dir, output_dir):
204204
converted_files.append(file_name)
205205
write_to_json(output_dir / file_name, output_json)
206206
except Exception as e:
207+
logger.debug(str(e), exc_info=True)
207208
failed_files.append(file_name)
208209

209210
return converted_files

src/superannotate/lib/core/usecases/annotations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ def _upload_annotation(
181181
if response.errors:
182182
return path, False
183183
return path, True
184-
except Exception as _:
184+
except Exception as e:
185+
logger.debug(str(e), exc_info=True)
185186
return path, False
186187

187188
def get_bucket_to_upload(self, ids: List[int]):

0 commit comments

Comments
 (0)