Skip to content

Commit 13bbe48

Browse files
KIRA009abrichr
andauthored
feat(logging): store application logs (#854)
* feat: Wrap all processes inside a try catch block * chore: Modify files to use the custom logger * lint: flake8 lint --------- Co-authored-by: Richard Abrich <[email protected]>
1 parent 432af01 commit 13bbe48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+113
-119
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ from pprint import pformat
1818
import json
1919
2020
# external
21-
from loguru import logger
21+
from openadapt.custom_logger import logger
2222
import numpy as np
2323
2424
# local

experiments/fastsamsom.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
from pprint import pformat
44

5-
from loguru import logger
65
from PIL import Image
76
import numpy as np
87

98
from openadapt import adapters, config, contrib, utils, vision
10-
9+
from openadapt.custom_logger import logger
1110

1211
CONTRAST_FACTOR = 10000
1312
DEBUG = False

experiments/gpt4o_seg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import sys
66
import time
77

8-
from loguru import logger
98
from PIL import Image
109

1110
from openadapt import cache, config, models, plotting, utils
1211
from openadapt.adapters import openai
12+
from openadapt.custom_logger import logger
1313

1414

1515
@cache.cache(force_refresh=False)

experiments/handle_similar_segments.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import os
44

55
from PIL import Image
6-
from loguru import logger
76

87
from openadapt import adapters, cache, config, plotting, utils, vision
9-
8+
from openadapt.custom_logger import logger
109

1110
DEBUG = True
1211
MIN_SEGMENT_SSIM = 0.95 # threshold for considering segments structurally similar

openadapt/adapters/prompt.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
"""Adapter for prompting foundation models."""
22

3-
from loguru import logger
43
from typing import Type
5-
from PIL import Image
64

5+
from PIL import Image
76

7+
from openadapt.custom_logger import logger
88
from openadapt.drivers import anthropic, google, openai
99

10-
1110
# Define a list of drivers in the order they should be tried
1211
DRIVER_ORDER: list[Type] = [openai, google, anthropic]
1312

openadapt/adapters/replicate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import io
44
import os
55

6-
from loguru import logger
76
from PIL import Image
87
import fire
98
import replicate
109
import requests
1110

1211
from openadapt import cache, utils
1312
from openadapt.config import config
13+
from openadapt.custom_logger import logger
1414

1515

1616
@cache.cache()

openadapt/adapters/som.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import os
77
import tempfile
88

9-
from loguru import logger
109
from PIL import Image
1110
import fire
1211
import gradio_client
1312

1413
from openadapt.config import config
14+
from openadapt.custom_logger import logger
1515

1616

1717
def save_image_to_temp_file(img: Image.Image) -> str:

openadapt/adapters/ultralytics.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
import os
1212
import time
1313

14-
from loguru import logger
1514
from PIL import Image, ImageColor
16-
import numpy as np
1715

16+
# importing is required for use() to work
17+
from PySide6.QtCore import Qt # noqa
1818

1919
# use() required when invoked from tray
2020
import matplotlib
21+
import numpy as np
2122

22-
# importing is required for use() to work
23-
from PySide6.QtCore import Qt # noqa
23+
from openadapt.custom_logger import logger
2424

2525
matplotlib.use("Qt5Agg")
2626

@@ -34,7 +34,6 @@
3434

3535
from openadapt import cache
3636

37-
3837
FASTSAM_MODEL_NAMES = (
3938
"FastSAM-x.pt",
4039
"FastSAM-s.pt",

openadapt/app/cards.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from openadapt.app.objects.local_file_picker import LocalFilePicker
1313
from openadapt.app.util import get_scrub, set_dark, set_scrub, sync_switch
1414
from openadapt.record import record
15+
from openadapt.utils import WrapStdout
1516

1617

1718
class RecordProc:
@@ -56,7 +57,7 @@ def is_running(self) -> bool:
5657
def start(self, func: callable, args: tuple, kwargs: dict) -> None:
5758
"""Start the recording process."""
5859
self.record_proc = multiprocessing.Process(
59-
target=func,
60+
target=WrapStdout(func),
6061
args=args,
6162
kwargs=kwargs,
6263
)

openadapt/app/dashboard/api/action_events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"""API endpoints for recordings."""
22

33
from fastapi import APIRouter
4-
from loguru import logger
54

5+
from openadapt.custom_logger import logger
66
from openadapt.db import crud
77

88

0 commit comments

Comments
 (0)