scmcp-shared 0.2.1__py3-none-any.whl → 0.2.5__py3-none-any.whl

scmcp_shared/util.py

@@ -19,7 +19,7 @@ def filter_args(request, func, **extra_kwargs):
     return func_kwargs
 
 
-def add_op_log(adata, func, kwargs):
+def add_op_log(adata, func, kwargs, adinfo):
     import hashlib
     import json
     
@@ -37,7 +37,7 @@ def add_op_log(adata, func, kwargs):
         func_name = func.__class__.__name__
     else:
         func_name = str(func)
-    new_kwargs = {}
+    new_kwargs = {**adinfo.model_dump()}
     for k,v in kwargs.items():
         if isinstance(v, tuple):
             new_kwargs[k] = list(v)
@@ -104,7 +104,7 @@ def set_fig_path(axes, func=None, **kwargs):
             args.append(f"{k}-{'-'.join([str(i) for i in v])}")
         else:
             args.append(f"{k}-{v}")
-    args_str = "_".join(args)
+    args_str = "_".join(args).replace(" ", "")
     fig_path = fig_dir / f"{func_name}_{args_str}.png"
     try:
         savefig(axes, fig_path)
@@ -135,13 +135,22 @@ async def get_figure(request):
     return FileResponse(figure_path)
 
 
-async def forward_request(func, request, **kwargs):
+def add_figure_route(server):
+    from starlette.routing import Route
+    server._additional_http_routes = [Route("/figures/{figure_name}", endpoint=get_figure)]
+
+
+async def forward_request(func, request, adinfo, **kwargs):
     from fastmcp import Client
     forward_url = get_env("FORWARD")
     request_kwargs = request.model_dump()
     request_args = request.model_fields_set
-    func_kwargs = {"request": {k: request_kwargs.get(k) for k in request_args}}
-    func_kwargs.update({k:v for k,v in kwargs.items() if v is not None})
+    func_kwargs = {
+        "request": {k: request_kwargs.get(k) for k in request_args},
+        "adinfo": adinfo.model_dump()
+    }
+    print(func_kwargs)
+    # func_kwargs.update({k:v for k,v in kwargs.items() if v is not None})
     if not forward_url:
         return None
         
@@ -170,39 +179,25 @@ def obsm2adata(adata, obsm_key):
         return AnnData(adata.obsm[obsm_key], obs=adata.obs, obsm=adata.obsm)
 
 
-async def get_figure(request):
-    figure_name = request.path_params["figure_name"]
-    figure_path = f"./figures/{figure_name}"
-    
-    if not os.path.isfile(figure_path):
-        return Response(content={"error": "figure not found"}, media_type="application/json")
-    
-    return FileResponse(figure_path)
-
-
-def add_figure_route(server):
-    from starlette.routing import Route
-    server._additional_http_routes = [Route("/figures/{figure_name}", endpoint=get_figure)]
-
-
 def get_ads():
     ctx = get_context()
     ads = ctx.request_context.lifespan_context
     return ads
 
 
-def generate_msg(request, adata, ads):
-    kwargs = request.model_dump()
-    sampleid = kwargs.get("sampleid")
-    dtype = kwargs.get("dtype", "exp")
-    return {"sampleid": sampleid or ads.active_id, "dtype": dtype, "adata": adata}
+def generate_msg(adinfo, adata, ads):
+    return {"sampleid": adinfo.sampleid or ads.active_id, "dtype": adinfo.adtype, "adata": adata}
+
 
+def sc_like_plot(plot_func, adata, request, adinfo, **kwargs):
+    from matplotlib import pyplot as plt
 
-def sc_like_plot(plot_func, adata, request, **kwargs):
     func_kwargs = filter_args(request, plot_func, show=False, save=False)
     axes = plot_func(adata, **func_kwargs)
+    if axes is None:
+        axes = plt.gca()
     fig_path = set_fig_path(axes, plot_func, **func_kwargs)
-    add_op_log(adata, plot_func, func_kwargs)
+    add_op_log(adata, plot_func, func_kwargs, adinfo)
     return fig_path
 
 

{scmcp_shared-0.2.1.dist-info → scmcp_shared-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scmcp_shared
-Version: 0.2.1
+Version: 0.2.5
 Summary: A shared function libray for scmcphub
 Author-email: shuang <hsh-me@outlook.com>
 License: BSD 3-Clause License

scmcp_shared-0.2.5.dist-info/RECORD

@@ -0,0 +1,19 @@
+scmcp_shared/__init__.py,sha256=9WXFueskl8xksdIA9MJUyauJD-k4jXiK79wuJfC3MuI,24
+scmcp_shared/logging_config.py,sha256=eCuLuyxMmbj8A1E0VqYWoKA5JPTSbo6cmjS4LOyd0RQ,872
+scmcp_shared/util.py,sha256=pQFqFVf8leGqKK38RgXzgtEvXWi8dZBjTuJB0rKTOnw,6957
+scmcp_shared/schema/__init__.py,sha256=iwFLgyjBFYDS2OMCXhv54Jb3LUQr2EH5POqaqN5gBX0,412
+scmcp_shared/schema/io.py,sha256=jpWcw4nUKsCRkG9ybOHLb2kS4wyN16Rj1AuzR-8Sm6U,4893
+scmcp_shared/schema/pl.py,sha256=rzE09wHMY3JR56HZc-QfIUUM0fGXRKd-7Dh3CrQrFB0,29547
+scmcp_shared/schema/pp.py,sha256=48F6oKf-I8IZuNQDfq_Lpp3fLLKA4PruqRje_ZrtTyw,21664
+scmcp_shared/schema/tl.py,sha256=9mYTwdk3XSJ2A_TdqS_974VSS7Nl4NKyewVN1bwnJBg,34450
+scmcp_shared/schema/util.py,sha256=x_2GPsmliHabi9V5C6YEv_M8ZHJsinDZJ6ePWrLPmcI,4815
+scmcp_shared/server/__init__.py,sha256=zLV89TwMICoaAIqx65_Vbh1RP72Z0EgSvqBMFZhYBpc,1790
+scmcp_shared/server/io.py,sha256=0XzQoxipwK4ml2gmPfrZqMYyy37kqyUyr8hSCnjzyVE,2631
+scmcp_shared/server/pl.py,sha256=9DGF7PM-rB1CDMdv_vHiSZmI-ggMWcRKEZwB1GVenxI,12426
+scmcp_shared/server/pp.py,sha256=6p6jGTunU858uuGoXHodiWTdHRufKs9-_WlWtS82esQ,12976
+scmcp_shared/server/tl.py,sha256=OAF-dFQ5Lhw8RrAUir860IWgbPcaeAyQbFdKcP_tlQ4,14912
+scmcp_shared/server/util.py,sha256=MXDpJA1Zn2eFE_LpW5t4eVUdGr6dUOXIM8KoyfweJUA,9607
+scmcp_shared-0.2.5.dist-info/METADATA,sha256=dTs0LfEmYxRWQpv9rkvfnkeqzCRTGrHfzhZZCYBLdeE,2099
+scmcp_shared-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+scmcp_shared-0.2.5.dist-info/licenses/LICENSE,sha256=YNr1hpea195yq-wGtB8j-2dGtt7A5G00WENmxa7JGco,1495
+scmcp_shared-0.2.5.dist-info/RECORD,,

scmcp_shared/schema/base.py

@@ -1,11 +0,0 @@
-from pydantic import Field, BaseModel,ConfigDict
-
-
-class AdataModel(BaseModel):
-    """Input schema for the adata tool."""
-    sampleid: str = Field(default=None, description="adata sampleid")
-    adtype: str = Field(default="exp", description="adata.X data type")
-
-    model_config = ConfigDict(
-        extra="ignore"
-    )

scmcp_shared-0.2.1.dist-info/RECORD

@@ -1,20 +0,0 @@
-scmcp_shared/__init__.py,sha256=_oNJ0-RgmWF_9YXGOzXxULVblXWDY-ijzApYQs3nBNU,24
-scmcp_shared/logging_config.py,sha256=eCuLuyxMmbj8A1E0VqYWoKA5JPTSbo6cmjS4LOyd0RQ,872
-scmcp_shared/util.py,sha256=yQpVLqzvDNMRGF9sywh0l5M0XH_u3gbi8MC8aQHj-CQ,7130
-scmcp_shared/schema/__init__.py,sha256=fwMJT4mQ3rvRJpSz9ruwwZU1GbXsUYPVQRpP56Az_JM,28
-scmcp_shared/schema/base.py,sha256=hWh0534xon4gyIxwXUBVR067uFiW73nZccSs6DkcwYc,326
-scmcp_shared/schema/io.py,sha256=yxa0BGQXuHCUvv6ZGQApPqMOlyJuC-eQNk7jlRGsMJ8,4913
-scmcp_shared/schema/pl.py,sha256=I9SCJgjmfB0VTNio4uNnP26ajWCnsHPsDoO-yMuzYVo,29578
-scmcp_shared/schema/pp.py,sha256=Uhe28zD71UDZbziesH6bgQXIRXQz_HHrr8-Hb4RQsKI,21696
-scmcp_shared/schema/tl.py,sha256=QV0dP-5ZtEKUDmSV9m5ryx7uQub4rw4in7PYsxId5nU,34485
-scmcp_shared/schema/util.py,sha256=R0MThHKKGYGGJu-hMc-i7fomW-6ugaoQqPi_hbKrB5A,4844
-scmcp_shared/server/__init__.py,sha256=vGYGUpLt8XHRbJI84Ox6WnK4ntzsbTal99Uu14nav60,1796
-scmcp_shared/server/io.py,sha256=zT9HBVMhIznm7im22ixGtlqFQSUyiengjgSk2Hi6WYI,2568
-scmcp_shared/server/pl.py,sha256=TbgfOPxh0b01Er7qVN0QrPd54HF2Dcf7LBgGG7DtNaA,11414
-scmcp_shared/server/pp.py,sha256=iVCHhQJKNPAboJmb1vvjbFfLOH8yibFRm8mCk2-JhHs,12382
-scmcp_shared/server/tl.py,sha256=fFTfE0_kXQ6e21pj-sS8vwkyCp8pqe2Mhe1avA9wjZ8,14024
-scmcp_shared/server/util.py,sha256=LSdsBpk_deQZPT33nedyvILdHKcPFaHsr8s-oREh9Sc,9175
-scmcp_shared-0.2.1.dist-info/METADATA,sha256=u91DFN3s3GzOmnB8MrZWSSnlRf9zbRFpGRogLzM-G7o,2099
-scmcp_shared-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-scmcp_shared-0.2.1.dist-info/licenses/LICENSE,sha256=YNr1hpea195yq-wGtB8j-2dGtt7A5G00WENmxa7JGco,1495
-scmcp_shared-0.2.1.dist-info/RECORD,,