Code

Beamline Groups & Filtering#203

Code

Merged

stufisher merged 127 commits intomasterispyb/py-ispyb:masterfrom beamline-groups-permissionsispyb/py-ispyb:beamline-groups-permissionsCopy head branch name to clipboardNov 3, 2022

+4,496-1,355

Commits

Commits on Oct 26, 2022

• add db options, add example for legacy routes

  stufisher

  committed
  0a4b002

• call correct function

  stufisher

  committed
  4b4be0f

• activity is also used to store whos online information, move to more generic location

  stufisher

  committed
  744939d

• lint

  stufisher

  committed
  230028a

• initial work on beamline grouping and filtering

  stufisher

  committed
  24eed16

• apply to samples

  stufisher

  committed
  431f4a8

• style

  stufisher

  committed
  efcc1fc

• make events query more descriptive

  stufisher

  committed
  7033d35

• add proposal and session resources, authorized by groups

  stufisher

  committed
  117b46f

• lint

  stufisher

  committed
  fc41fb2

• update sample

  stufisher

  committed
  e8f5d32

• move legacy routes out of root path to avoid collisions

  stufisher

  committed
  0ba399d

• username -> login

  stufisher

  committed
  4d2a3b4

• test groupings

  stufisher

  committed
  524ec91

• lint

  stufisher

  committed
  23fb5d0

• update tests for new route location

  stufisher

  committed
  0e96780

• update legacy routes, move to separate folder

  stufisher

  committed
  ce298f3

• bump ispyb-models

  stufisher

  committed
  18270aa

• only return groups if beamlineGroups defined

  stufisher

  committed
  ab057b4

• groups could be empty

  stufisher

  committed
  5550b1e

• match beamlines and count with test data

  stufisher

  committed
  dc8d3f9

• match beamlines and count with test data

  stufisher

  committed
  cc53acb

• ignore order

  stufisher

  committed
  963bc62

• make joins optional, auth labcontacts

  stufisher

  committed
  4d2c95e

• put back proposalId

  stufisher

  committed
  eabed22

• distinct

  stufisher

  committed
  518fb13

• style

  stufisher

  committed
  a14b4a4

• document some dc columns

  stufisher

  committed
  e927e70

• warn about missing options

  stufisher

  committed
  9bc2880

• add subsamples, update contains_eager

  stufisher

  committed
  82e0aed

• remove debug

  stufisher

  committed
  457f9bb

• lint

  stufisher

  committed
  e2f343e

• add proteins, add ordering

  stufisher

  committed
  2775448

• remove componenttype for now

  stufisher

  committed
  84bdd94

• protein work

  stufisher

  committed
  2d8a742

• sort_order can be none

  stufisher

  committed
  9c220dd

• add event status filter

  stufisher

  committed
  10271fe

• outerjoin...

  stufisher

  committed
  00739bf

• add sample positions, sampleimages, queued status

  stufisher

  committed
  5337d6b

• add proteins router

  stufisher

  committed
  606841c

• add attachments, split dc parts from events

  stufisher

  committed
  41caf74

• lint

  stufisher

  committed
  b2ee5db

• lint

  stufisher

  committed
  b81fb89

• add uiGroup, set empty grouping on unset

  stufisher

  committed
  d842194

• correct empty groupings

  stufisher

  committed
  9a77744

• update contains_eager to non-legacy

  stufisher

  committed
  aa0660c

• correct image loader

  stufisher

  committed
  dd41e3c

• test

  stufisher

  committed
  80e65cb

• bump ispyb-models

  stufisher

  committed
  d8e9824

• consistent naming

  stufisher

  committed
  9b5cdb6

• syntax

  stufisher

  committed
  9e479a3

• add session filters

  stufisher

  committed
  14c7b31

• rough doc

  stufisher

  committed
  fc18d62

• rough doc

  stufisher

  committed
  f73a554

• fix tests

  stufisher

  committed
  e5bf84c

• doc

  stufisher

  committed
  f3cd540

• update naming

  stufisher

  committed
  aeece36

• uiGroups rename, return with current user

  stufisher

  committed
  be770de

• rename up classes to avoid collision

  stufisher

  committed
  e6e5629

• wip

  stufisher

  committed
  29a6985

• wip

  stufisher

  committed
  4a79dc1

• bump ispyb-models

  stufisher

  committed
  5dc7fdc

• add root mapping, remove trailing /

  stufisher

  committed
  da72767

• add path_map for sample images

  stufisher

  committed
  8556711

• correct uiGroup

  stufisher

  committed
  c470fb2

• or permissions

  stufisher

  committed
  4df250f

• tidy schema

  stufisher

  committed
  fc78b5c

• doc, correct join

  stufisher

  committed
  b85df82

• add eventType filter

  stufisher

  committed
  323911e

• correct routes

  stufisher

  committed
  88ee5e6

• fix tests

  stufisher

  committed
  538d418

• correct schema

  stufisher

  committed
  b66e9f6

• rename to with_authorization, add ProposalHasPerson

  stufisher

  committed
  9b988c2

• uniquify uiGroups

  stufisher

  committed
  bfb90cc

• return list of users beamlines

  stufisher

  committed
  b630908

• consistent naming

  stufisher

  committed
  01e7e58

• update docs

  stufisher

  committed
  c783818

• add diffn thumbnail

  stufisher

  committed
  5507dde

• group, optional

  stufisher

  committed
  2503b5b

• correct session and proposal queries, add duration to events

  stufisher

  committed
  801c066

• lint

  stufisher

  committed
  a1d7b42

• order...

  stufisher

  committed
  53706ab

• missing default

  stufisher

  committed
  710716b

• add xfe and energyscan base

  stufisher

  committed
  fe5bcdd

• temp remove RotationAxis enum

  stufisher

  committed
  b585170

• correct some queries

  stufisher

  committed
  973b45d

• add pia, some filters

  stufisher

  committed
  65d02ae

• bump models

  stufisher

  committed
  856f742

• lint

  stufisher

  committed
  3fb19b3

• fix default sort

  stufisher

  committed
  49dd4b2

• improve performance (still work to do)

  stufisher

  committed
  a9ffe29

• potentially empty dataset

  stufisher

  committed
  35af554

• conint

  stufisher

  committed
  7ed4941

• filters

  stufisher

  committed
  ea9c3cb

• guard

  stufisher

  committed
  e3e8cef

• distinct

  stufisher

  committed
  98bb62f

• make sure there is always a condition applied

  stufisher

  committed
  f12fb6f

• join workflow, correct filters

  stufisher

  committed
  33cf738

• guard for missing table

  stufisher

  committed
  56e9947

• lint

  stufisher

  committed
  f52521e

• workflow steps, extra images

  stufisher

  committed
  5700bad

• update schemas

  stufisher

  committed
  45dbbe2

• wip

  stufisher

  committed
  dfab96f

• refactor

  stufisher

  committed
  6ce47dc

• lint

  stufisher

  committed
  fc4849b

• add auth options for tests

  stufisher

  committed
  e6bbbff

• add sessionId, proposalId where needed

  stufisher

  committed
  8016a35

• correct tests

  stufisher

  committed
  26efd39

• minor fixes

  stufisher

  committed
  955dc2d

• typo

  stufisher

  committed
  0d9a28e

• check for file, change type

  stufisher

  committed
  8607968

• minor fixes

  stufisher

  committed
  cdb03e7

• missed refactorings

  stufisher

  committed
  f4264ac

• add sc type/capacity, make available to ui

  stufisher

  committed
  347cece

• style

  stufisher

  committed
  29b59c6

• make patch work

  stufisher

  committed
  36cdbb1

• add exception handler

  stufisher

  committed
  5b0096c

• dont clobber the existing model

  stufisher

  committed
  4e4cd5b

• handle enums

  stufisher

  committed
  8974fcf

• add sample specific container model

  stufisher

  committed
  03cfaf4

• lint...

  stufisher

  committed
  47fff3b

• update models

  stufisher

  committed
  d875d26

Commits on Nov 3, 2022

• extract into get_options

  stufisher

  committed
  6ff50a3

• improve tests

  stufisher

  committed
  e724261

• missed get_options, add test

  stufisher

  committed
  176c4a6

• more tests

  stufisher

  committed
  679f817

• fix order

  stufisher

  committed
  fe5be3f