fixed celery

image_markuper/__init__.py

@@ -1,5 +0,0 @@
-__version__ = "0.1.0"
-__version_info__ = tuple(
-    int(num) if num.isdigit() else num
-    for num in __version__.replace("-", ".", 1).split(".")
-)

image_markuper/config/settings/base.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 import environ
 
-ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
+ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent.parent.parent
 # image_markuper/
 APPS_DIR = ROOT_DIR / "image_markuper"
 env = environ.Env()
@@ -71,11 +71,7 @@ THIRD_PARTY_APPS = [
     "drf_spectacular",
 ]
 
-LOCAL_APPS = [
+LOCAL_APPS = ["users", "dicom"]
-    "image_markuper.users",
-    "image_markuper.dicom"
-    # Your stuff: custom apps go here
-]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 

image_markuper/dicom/api/serializers.py

@@ -180,7 +180,7 @@ class ProjectSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Project
-        fields = ["files", "slug", "created"]
+        fields = ["files", "slug", "created", "stl"]
 
 
 class PatologyGenerateSerializer(serializers.Serializer):

image_markuper/dicom/models/base.py

@@ -9,6 +9,7 @@ User = get_user_model()
 class Project(models.Model):
     user = models.ForeignKey(User, related_name="projects", on_delete=models.CASCADE)
     slug = models.SlugField(max_length=10)
+    stl = models.FileField(blank=True)
 
     created = models.DateTimeField(auto_now_add=True)
 

image_markuper/dicom/services.py

@@ -27,7 +27,7 @@ def process_files(
         if content_type == "DICOM medical imaging data":
             Dicom.objects.create(file=file, project=project, user=user)
         elif "Zip" in content_type:
-            dit_path = f"tmp/{generate_charset(10)}"
+            dit_path = f"/tmp/{generate_charset(10)}"
             os.mkdir(dit_path)
             with zipfile.ZipFile(file.temporary_file_path(), "r") as zip_ref:
                 zip_ref.extractall(dit_path)
@@ -96,7 +96,7 @@ def generate_3d_point_cloud(project_slug: str):
     return point_clouds
 
 
-def generate_3d_model(project: Project, thr=800) -> str:
+def generate_3d_model(project: Project, thr=800):
     image = []
     for file in project.files.all():
         image.append(pydicom.dcmread(file.file.path).pixel_array)
@@ -111,4 +111,9 @@ def generate_3d_model(project: Project, thr=800) -> str:
 
     pth = f"/tmp/{generate_charset(4)}.stl"
     solid.save(pth)
-    return pth
+    path = Path(pth)
+    with path.open(mode="rb") as f:
+        project.stl = File(f, name=pth.split("/")[-1])
+        project.save()
+
+    os.remove(pth)

image_markuper/dicom/signals.py

@@ -1,4 +1,5 @@
 from dicom.models import Dicom, Project
+from dicom.tasks import process_project
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from utils.generators import generate_charset
@@ -12,6 +13,7 @@ def create_project(sender, instance: Project, created, **kwargs):
             slug = generate_charset(5)
         instance.slug = slug
         instance.save()
+        process_project.apply_async(kwargs={"slug": slug})
 
 
 @receiver(post_save, sender=Dicom)

image_markuper/dicom/tasks.py

@@ -4,6 +4,7 @@ from dicom.services import generate_3d_model
 
 
 @shared_task()
-def process_dicom(pk: int):
+def process_project(slug: str):
-    generate_3d_model(Project.objects.get(pk=pk))
+    print(slug)
-    return pk
+    generate_3d_model(Project.objects.get(slug=slug))
+    return slug